diff options
| author | Emil Velikov <[email protected]> | 2013-09-28 18:11:20 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2013-11-16 14:02:15 +0000 |
| commit | 01d35eb372f1ac7d8633af783424c32d3b6239e3 (patch) | |
| tree | 37b1ac3febf73f5b95106a676ad0fef5587e29b2 /src/mesa/drivers | |
| parent | b51b3fc5375999cfd3661d8606d51f7e7d926d31 (diff) | |
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 <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/common/Android.mk | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/Makefile.am | 10 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/Makefile.sources | 8 |
3 files changed, 9 insertions, 11 deletions
diff --git a/src/mesa/drivers/dri/common/Android.mk b/src/mesa/drivers/dri/common/Android.mk index b3dac29dd44..0489a32de93 100644 --- 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 7f87ed6f560..e500bdb3038 100644 --- 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 040b7172541..8469b49500c 100644 --- 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 |