fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 07:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

st/egl: use *_FILE over *_SOURCES names for filelists

Browse source 
Silence automake warnings about missing program/library whenever
the _SOURCES suffix is used for temporary variable names.

  warning: variable 'gdi_SOURCES' is defined but no program or
  library has 'gdi' as canonical name (possible typo)

Acked-by: Matt Turner <mattst88@gmail.com>
Reported-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reported-by: Johannes Obermayr <johannesobermayr@gmx.de>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70581
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Emil Velikov 2013-10-04 13:18:25 +01:00
parent e133c0103d
commit 9560d34fcf
4 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/state_trackers/egl/Android.mk
View file

@ -23,14 +23,14 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
# get common_SOURCES, android_SOURCES # get common_FILES, android_FILES
include $(LOCAL_PATH)/Makefile.sources include $(LOCAL_PATH)/Makefile.sources
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(common_SOURCES) \ $(common_FILES) \
$(android_SOURCES) $(android_FILES)
LOCAL_CFLAGS := -DHAVE_ANDROID_BACKEND LOCAL_CFLAGS := -DHAVE_ANDROID_BACKEND

12
src/gallium/state_trackers/egl/Makefile.am
View file

@ -32,10 +32,10 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/include -I$(top_srcdir)/include
noinst_LTLIBRARIES = libegl.la noinst_LTLIBRARIES = libegl.la
libegl_la_SOURCES = $(common_SOURCES) libegl_la_SOURCES = $(common_FILES)
if HAVE_EGL_PLATFORM_X11 if HAVE_EGL_PLATFORM_X11
libegl_la_SOURCES += $(x11_SOURCES) $(x11_drm_SOURCES) libegl_la_SOURCES += $(x11_FILES) $(x11_drm_FILES)
AM_CFLAGS += \ AM_CFLAGS += \
$(X11_INCLUDES) \ $(X11_INCLUDES) \
$(LIBDRM_CFLAGS) \ $(LIBDRM_CFLAGS) \
@ -49,7 +49,7 @@ AM_CPPFLAGS += \
endif endif
if HAVE_EGL_PLATFORM_WAYLAND if HAVE_EGL_PLATFORM_WAYLAND
libegl_la_SOURCES += $(wayland_SOURCES) libegl_la_SOURCES += $(wayland_FILES)
AM_CFLAGS += \ AM_CFLAGS += \
$(LIBDRM_CFLAGS) \ $(LIBDRM_CFLAGS) \
$(WAYLAND_CFLAGS) $(WAYLAND_CFLAGS)
@ -62,7 +62,7 @@ AM_CPPFLAGS += \
endif endif
if HAVE_EGL_PLATFORM_DRM if HAVE_EGL_PLATFORM_DRM
libegl_la_SOURCES += $(drm_SOURCES) libegl_la_SOURCES += $(drm_FILES)
AM_CFLAGS += \ AM_CFLAGS += \
$(LIBDRM_CFLAGS) $(LIBDRM_CFLAGS)
AM_CPPFLAGS += \ AM_CPPFLAGS += \
@ -73,14 +73,14 @@ AM_CPPFLAGS += \
endif endif
if HAVE_EGL_PLATFORM_FBDEV if HAVE_EGL_PLATFORM_FBDEV
libegl_la_SOURCES += $(fbdev_SOURCES) libegl_la_SOURCES += $(fbdev_FILES)
AM_CPPFLAGS += \ AM_CPPFLAGS += \
-I$(top_srcdir)/src/gallium/winsys/sw \ -I$(top_srcdir)/src/gallium/winsys/sw \
-DHAVE_FBDEV_BACKEND -DHAVE_FBDEV_BACKEND
endif endif
if HAVE_EGL_PLATFORM_NULL if HAVE_EGL_PLATFORM_NULL
libegl_la_SOURCES += $(null_SOURCES) libegl_la_SOURCES += $(null_FILES)
AM_CPPFLAGS += \ AM_CPPFLAGS += \
-I$(top_srcdir)/src/gallium/winsys/sw \ -I$(top_srcdir)/src/gallium/winsys/sw \
-DHAVE_NULL_BACKEND -DHAVE_NULL_BACKEND

18
src/gallium/state_trackers/egl/Makefile.sources
View file

@ -1,4 +1,4 @@
common_SOURCES := \ common_FILES := \
common/egl_g3d_api.c \ common/egl_g3d_api.c \
common/egl_g3d.c \ common/egl_g3d.c \
common/egl_g3d_image.c \ common/egl_g3d_image.c \
@ -7,33 +7,33 @@ common_SOURCES := \
common/native_helper.c \ common/native_helper.c \
common/native_wayland_drm_bufmgr.c common/native_wayland_drm_bufmgr.c
android_SOURCES := \ android_FILES := \
android/native_android.cpp android/native_android.cpp
drm_SOURCES := \ drm_FILES := \
drm/modeset.c \ drm/modeset.c \
drm/native_drm.c drm/native_drm.c
fbdev_SOURCES := \ fbdev_FILES := \
fbdev/native_fbdev.c fbdev/native_fbdev.c
gdi_SOURCES := \ gdi_FILES := \
gdi/native_gdi.c gdi/native_gdi.c
null_SOURCES := \ null_FILES := \
null/native_null.c null/native_null.c
x11_SOURCES := \ x11_FILES := \
x11/glxinit.c \ x11/glxinit.c \
x11/native_dri2.c \ x11/native_dri2.c \
x11/native_x11.c \ x11/native_x11.c \
x11/native_ximage.c x11/native_ximage.c
x11_drm_SOURCES := \ x11_drm_FILES := \
x11/x11_screen.c \ x11/x11_screen.c \
x11/dri2.c x11/dri2.c
wayland_SOURCES := \ wayland_FILES := \
wayland/native_drm.c \ wayland/native_drm.c \
wayland/native_shm.c \ wayland/native_shm.c \
wayland/native_wayland.c wayland/native_wayland.c

10
src/gallium/state_trackers/egl/SConscript
View file

@ -11,11 +11,11 @@ env.Append(CPPPATH = [
'.', '.',
]) ])
sources = env.ParseSourceList('Makefile.sources', 'common_SOURCES') sources = env.ParseSourceList('Makefile.sources', 'common_FILES')
if env['platform'] == 'windows': if env['platform'] == 'windows':
env.Append(CPPDEFINES = ['HAVE_GDI_BACKEND']) env.Append(CPPDEFINES = ['HAVE_GDI_BACKEND'])
sources.append(env.ParseSourceList('Makefile.sources', 'gdi_SOURCES')) sources.append(env.ParseSourceList('Makefile.sources', 'gdi_FILES'))
else: else:
if env['drm']: if env['drm']:
env.PkgUseModules('DRM') env.PkgUseModules('DRM')
@ -25,10 +25,10 @@ else:
'#/src/glx', '#/src/glx',
'#/src/mapi', '#/src/mapi',
]) ])
sources.append(env.ParseSourceList('Makefile.sources', 'x11_SOURCES')) sources.append(env.ParseSourceList('Makefile.sources', 'x11_FILES'))
if env['drm']: if env['drm']:
env.Append(CPPDEFINES = ['GLX_DIRECT_RENDERING']) env.Append(CPPDEFINES = ['GLX_DIRECT_RENDERING'])
sources.append(env.ParseSourceList('Makefile.sources', 'x11_drm_SOURCES')) sources.append(env.ParseSourceList('Makefile.sources', 'x11_drm_FILES'))
if env['drm'] and False: if env['drm'] and False:
# XXX: Disabled as it depends on gbm, which is not yet built with scons # XXX: Disabled as it depends on gbm, which is not yet built with scons
env.Append(CPPDEFINES = ['HAVE_DRM_BACKEND']) env.Append(CPPDEFINES = ['HAVE_DRM_BACKEND'])
@ -36,7 +36,7 @@ else:
'#/src/gbm/main', '#/src/gbm/main',
'#/src/gallium/state_trackers/gbm', '#/src/gallium/state_trackers/gbm',
]) ])
sources.append(env.ParseSourceList('Makefile.sources', 'drm_SOURCES')) sources.append(env.ParseSourceList('Makefile.sources', 'drm_FILES'))
st_egl = env.ConvenienceLibrary( st_egl = env.ConvenienceLibrary(
target = 'st_egl', target = 'st_egl',