[Mesa-dev] [PATCH 01/14] egl/main: Bring in the Makefile.sources

[Emil Velikov]

Rather than having the sources list duplicated across all three
build systems, define it once and use it whenever needed.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/egl/main/Android.mk       | 23 ++++-------------------
 src/egl/main/Makefile.am      | 40 +++-------------------------------------
 src/egl/main/Makefile.sources | 38 ++++++++++++++++++++++++++++++++++++++
 src/egl/main/SConscript       | 21 ++-------------------
 4 files changed, 47 insertions(+), 75 deletions(-)
 create mode 100644 src/egl/main/Makefile.sources

diff --git a/src/egl/main/Android.mk b/src/egl/main/Android.mk
index 580289f..50d617d 100644
--- a/src/egl/main/Android.mk
+++ b/src/egl/main/Android.mk
@@ -25,25 +25,10 @@
 
 LOCAL_PATH := $(call my-dir)
 
-# from Makefile
-SOURCES = \
-	eglapi.c \
-	eglarray.c \
-	eglconfig.c \
-	eglcontext.c \
-	eglcurrent.c \
-	egldisplay.c \
-	egldriver.c \
-	eglfallbacks.c \
-	eglglobals.c \
-	eglimage.c \
-	egllog.c \
-	eglmisc.c \
-	eglmode.c \
-	eglscreen.c \
-	eglstring.c \
-	eglsurface.c \
-	eglsync.c
+include $(LOCAL_PATH)/Makefile.sources
+
+SOURCES := \
+	${LIBEGL_C_FILES}
 
 # ---------------------------------------
 # Build libGLES_mesa
diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
index 38758a0..6746bcc 100644
--- a/src/egl/main/Makefile.am
+++ b/src/egl/main/Makefile.am
@@ -19,6 +19,8 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
+include Makefile.sources
+
 AM_CFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/gbm/main \
@@ -32,43 +34,7 @@ AM_CFLAGS = \
 lib_LTLIBRARIES = libEGL.la
 
 libEGL_la_SOURCES = \
-	eglapi.c \
-	eglapi.h \
-	eglarray.c \
-	eglarray.h \
-	eglcompiler.h \
-	eglconfig.c \
-	eglconfig.h \
-	eglcontext.c \
-	eglcontext.h \
-	eglcurrent.c \
-	eglcurrent.h \
-	egldefines.h \
-	egldisplay.c \
-	egldisplay.h \
-	egldriver.c \
-	egldriver.h \
-	eglfallbacks.c \
-	eglglobals.c \
-	eglglobals.h \
-	eglimage.c \
-	eglimage.h \
-	egllog.c \
-	egllog.h \
-	eglmisc.c \
-	eglmisc.h \
-	eglmode.c \
-	eglmode.h \
-	eglmutex.h \
-	eglscreen.c \
-	eglscreen.h \
-	eglstring.c \
-	eglstring.h \
-	eglsurface.c \
-	eglsurface.h \
-	eglsync.c \
-	eglsync.h \
-	egltypedefs.h
+	${LIBEGL_C_FILES}
 
 libEGL_la_LIBADD = \
 	$(EGL_LIB_DEPS)
diff --git a/src/egl/main/Makefile.sources b/src/egl/main/Makefile.sources
new file mode 100644
index 0000000..6a917e2
--- /dev/null
+++ b/src/egl/main/Makefile.sources
@@ -0,0 +1,38 @@
+LIBEGL_C_FILES := \
+	eglapi.c \
+	eglapi.h \
+	eglarray.c \
+	eglarray.h \
+	eglcompiler.h \
+	eglconfig.c \
+	eglconfig.h \
+	eglcontext.c \
+	eglcontext.h \
+	eglcurrent.c \
+	eglcurrent.h \
+	egldefines.h \
+	egldisplay.c \
+	egldisplay.h \
+	egldriver.c \
+	egldriver.h \
+	eglfallbacks.c \
+	eglglobals.c \
+	eglglobals.h \
+	eglimage.c \
+	eglimage.h \
+	egllog.c \
+	egllog.h \
+	eglmisc.c \
+	eglmisc.h \
+	eglmode.c \
+	eglmode.h \
+	eglmutex.h \
+	eglscreen.c \
+	eglscreen.h \
+	eglstring.c \
+	eglstring.h \
+	eglsurface.c \
+	eglsurface.h \
+	eglsync.c \
+	eglsync.h \
+	egltypedefs.h
diff --git a/src/egl/main/SConscript b/src/egl/main/SConscript
index 8c57cea..390f28a 100644
--- a/src/egl/main/SConscript
+++ b/src/egl/main/SConscript
@@ -28,25 +28,8 @@ env.Append(CPPPATH = [
     '#/include',
 ])
 
-egl_sources = [
-    'eglapi.c',
-    'eglarray.c',
-    'eglconfig.c',
-    'eglcontext.c',
-    'eglcurrent.c',
-    'egldisplay.c',
-    'egldriver.c',
-    'eglfallbacks.c',
-    'eglglobals.c',
-    'eglimage.c',
-    'egllog.c',
-    'eglmisc.c',
-    'eglmode.c',
-    'eglscreen.c',
-    'eglstring.c',
-    'eglsurface.c',
-    'eglsync.c',
-]
+# parse Makefile.sources
+egl_sources = env.ParseSourceList('Makefile.sources', 'LIBEGL_C_FILES')
 
 egl = env.ConvenienceLibrary(
     target = 'egl',
-- 
2.0.0