From 9560d34fcf2dc75949aecbd0dc4cf95e9e080c2b Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 4 Oct 2013 13:18:25 +0100 Subject: [PATCH] st/egl: use *_FILE over *_SOURCES names for filelists 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 Reported-by: Ilia Mirkin Reported-by: Johannes Obermayr Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70581 Signed-off-by: Emil Velikov --- src/gallium/state_trackers/egl/Android.mk | 6 +++--- src/gallium/state_trackers/egl/Makefile.am | 12 ++++++------ .../state_trackers/egl/Makefile.sources | 18 +++++++++--------- src/gallium/state_trackers/egl/SConscript | 10 +++++----- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/gallium/state_trackers/egl/Android.mk b/src/gallium/state_trackers/egl/Android.mk index 2627608503c..b27e14b1f06 100644 --- a/src/gallium/state_trackers/egl/Android.mk +++ b/src/gallium/state_trackers/egl/Android.mk @@ -23,14 +23,14 @@ LOCAL_PATH := $(call my-dir) -# get common_SOURCES, android_SOURCES +# get common_FILES, android_FILES include $(LOCAL_PATH)/Makefile.sources include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - $(common_SOURCES) \ - $(android_SOURCES) + $(common_FILES) \ + $(android_FILES) LOCAL_CFLAGS := -DHAVE_ANDROID_BACKEND diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am index da360bb5aa9..c069c29c8c9 100644 --- a/src/gallium/state_trackers/egl/Makefile.am +++ b/src/gallium/state_trackers/egl/Makefile.am @@ -32,10 +32,10 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include noinst_LTLIBRARIES = libegl.la -libegl_la_SOURCES = $(common_SOURCES) +libegl_la_SOURCES = $(common_FILES) if HAVE_EGL_PLATFORM_X11 -libegl_la_SOURCES += $(x11_SOURCES) $(x11_drm_SOURCES) +libegl_la_SOURCES += $(x11_FILES) $(x11_drm_FILES) AM_CFLAGS += \ $(X11_INCLUDES) \ $(LIBDRM_CFLAGS) \ @@ -49,7 +49,7 @@ AM_CPPFLAGS += \ endif if HAVE_EGL_PLATFORM_WAYLAND -libegl_la_SOURCES += $(wayland_SOURCES) +libegl_la_SOURCES += $(wayland_FILES) AM_CFLAGS += \ $(LIBDRM_CFLAGS) \ $(WAYLAND_CFLAGS) @@ -62,7 +62,7 @@ AM_CPPFLAGS += \ endif if HAVE_EGL_PLATFORM_DRM -libegl_la_SOURCES += $(drm_SOURCES) +libegl_la_SOURCES += $(drm_FILES) AM_CFLAGS += \ $(LIBDRM_CFLAGS) AM_CPPFLAGS += \ @@ -73,14 +73,14 @@ AM_CPPFLAGS += \ endif if HAVE_EGL_PLATFORM_FBDEV -libegl_la_SOURCES += $(fbdev_SOURCES) +libegl_la_SOURCES += $(fbdev_FILES) AM_CPPFLAGS += \ -I$(top_srcdir)/src/gallium/winsys/sw \ -DHAVE_FBDEV_BACKEND endif if HAVE_EGL_PLATFORM_NULL -libegl_la_SOURCES += $(null_SOURCES) +libegl_la_SOURCES += $(null_FILES) AM_CPPFLAGS += \ -I$(top_srcdir)/src/gallium/winsys/sw \ -DHAVE_NULL_BACKEND diff --git a/src/gallium/state_trackers/egl/Makefile.sources b/src/gallium/state_trackers/egl/Makefile.sources index aaf6b8b6405..2f60b3ab348 100644 --- a/src/gallium/state_trackers/egl/Makefile.sources +++ b/src/gallium/state_trackers/egl/Makefile.sources @@ -1,4 +1,4 @@ -common_SOURCES := \ +common_FILES := \ common/egl_g3d_api.c \ common/egl_g3d.c \ common/egl_g3d_image.c \ @@ -7,33 +7,33 @@ common_SOURCES := \ common/native_helper.c \ common/native_wayland_drm_bufmgr.c -android_SOURCES := \ +android_FILES := \ android/native_android.cpp -drm_SOURCES := \ +drm_FILES := \ drm/modeset.c \ drm/native_drm.c -fbdev_SOURCES := \ +fbdev_FILES := \ fbdev/native_fbdev.c -gdi_SOURCES := \ +gdi_FILES := \ gdi/native_gdi.c -null_SOURCES := \ +null_FILES := \ null/native_null.c -x11_SOURCES := \ +x11_FILES := \ x11/glxinit.c \ x11/native_dri2.c \ x11/native_x11.c \ x11/native_ximage.c -x11_drm_SOURCES := \ +x11_drm_FILES := \ x11/x11_screen.c \ x11/dri2.c -wayland_SOURCES := \ +wayland_FILES := \ wayland/native_drm.c \ wayland/native_shm.c \ wayland/native_wayland.c diff --git a/src/gallium/state_trackers/egl/SConscript b/src/gallium/state_trackers/egl/SConscript index b86f8b5f063..bd0ee02d202 100644 --- a/src/gallium/state_trackers/egl/SConscript +++ b/src/gallium/state_trackers/egl/SConscript @@ -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': env.Append(CPPDEFINES = ['HAVE_GDI_BACKEND']) - sources.append(env.ParseSourceList('Makefile.sources', 'gdi_SOURCES')) + sources.append(env.ParseSourceList('Makefile.sources', 'gdi_FILES')) else: if env['drm']: env.PkgUseModules('DRM') @@ -25,10 +25,10 @@ else: '#/src/glx', '#/src/mapi', ]) - sources.append(env.ParseSourceList('Makefile.sources', 'x11_SOURCES')) + sources.append(env.ParseSourceList('Makefile.sources', 'x11_FILES')) if env['drm']: 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: # XXX: Disabled as it depends on gbm, which is not yet built with scons env.Append(CPPDEFINES = ['HAVE_DRM_BACKEND']) @@ -36,7 +36,7 @@ else: '#/src/gbm/main', '#/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( target = 'st_egl', -- 2.30.2