dri/common: move source file lists to Makefile.sources

* Allow the lists to be shared among build systems.
* Update automake and Android build systems.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/mesa/drivers/dri/common/Android.mk b/src/mesa/drivers/dri/common/Android.mk
index b3dac29dd4424cd088406377ec915a21fc671b9f..0489a32de933986b2edb544681520665adcfa4b6 100644 (file)
--- a/src/mesa/drivers/dri/common/Android.mk
+++ b/src/mesa/drivers/dri/common/Android.mk
@@ -40,7 +40,7 @@ LOCAL_C_INCLUDES := \
     $(intermediates) \
     $(MESA_DRI_C_INCLUDES)
 
-LOCAL_SRC_FILES := $(mesa_dri_common_SOURCES)
+LOCAL_SRC_FILES := $(DRI_COMMON_FILES)
 
 LOCAL_GENERATED_SOURCES := \
     $(intermediates)/xmlpool/options.h

diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am
index 7f87ed6f560afc791f9a5608f980d8f3bd4a929a..e500bdb30383e51af20a7affb0abd72edf3c58db 100644 (file)
--- a/src/mesa/drivers/dri/common/Makefile.am
+++ b/src/mesa/drivers/dri/common/Makefile.am
@@ -21,6 +21,8 @@
 
 SUBDIRS = xmlpool
 
+include Makefile.sources
+
 AM_CFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/ \
@@ -35,13 +37,9 @@ noinst_LTLIBRARIES = \
        libmegadriver_stub.la \
        libdri_test_stubs.la
 
-libdricommon_la_SOURCES = \
-       utils.c \
-       dri_util.c \
-       xmlconfig.c
+libdricommon_la_SOURCES = $(DRI_COMMON_FILES)
 
-libdri_test_stubs_la_SOURCES = \
-       dri_test.c
+libdri_test_stubs_la_SOURCES = $(test_stubs_FILES)
 libdri_test_stubs_la_CFLAGS = $(AM_CFLAGS) -DNO_MAIN
 
 libmegadriver_stub_la_SOURCES = megadriver_stub.c

diff --git a/src/mesa/drivers/dri/common/Makefile.sources b/src/mesa/drivers/dri/common/Makefile.sources
index 040b717254121a12f55802e42ea5e52fd672462f..8469b49500c08fd31afb8e3d56b9b9c7f0b340e3 100644 (file)
--- a/src/mesa/drivers/dri/common/Makefile.sources
+++ b/src/mesa/drivers/dri/common/Makefile.sources
@@ -1,11 +1,8 @@
-mesa_dri_common_gallium_SOURCES := \
+DRI_COMMON_FILES := \
        utils.c \
        dri_util.c \
        xmlconfig.c
 
-mesa_dri_common_SOURCES := \
-       $(mesa_dri_common_gallium_SOURCES)
-
 # Paths are relative to MESA_TOP.
 mesa_dri_common_INCLUDES := \
        include \
@@ -14,3 +11,6 @@ mesa_dri_common_INCLUDES := \
        src/mapi \
        src/mesa \
        src/mesa/drivers/dri/common
+
+test_stubs_FILES := \
+       dri_test.c