[Mesa-dev] [PATCH 5/8] make: Factor out source lists from drivers/dri/common into Makefile.sources

[Chad Versace]

In order that the autoconf and Android build can share the same source
lists, move the lists from
  src/mesa/drivers/dri/Makefile.defines
into
  src/mesa/drivers/dri/common/Makefile.sources

I would like for Android to just reuse Makefile.defines, but the file is
unsuitable for Android.

Signed-off: Chad Versace <chad at chad-versace.us>
---
 src/mesa/drivers/dri/Makefile.defines        |   23 ++++++++++-------------
 src/mesa/drivers/dri/common/Makefile.sources |   18 ++++++++++++++++++
 2 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 src/mesa/drivers/dri/common/Makefile.sources

diff --git a/src/mesa/drivers/dri/Makefile.defines b/src/mesa/drivers/dri/Makefile.defines
index 90ae551..536bcc6 100644
--- a/src/mesa/drivers/dri/Makefile.defines
+++ b/src/mesa/drivers/dri/Makefile.defines
@@ -1,14 +1,16 @@
 # -*-makefile-*-
 
+# MESA_TOP is relative the driver's directory.
+MESA_TOP := ../../../../..
+
+# Import mesa_dri_common_*
+include $(MESA_TOP)/src/mesa/drivers/dri/common/Makefile.sources
+
 COMMON_GALLIUM_SOURCES = \
-        ../common/utils.c \
-        ../common/vblank.c \
-        ../common/dri_util.c \
-        ../common/xmlconfig.c
+	$(addprefix ../common/, $(mesa_dri_common_gallium_SOURCES))
 
-COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
-        ../common/texmem.c \
-        ../common/drirenderbuffer.c
+COMMON_SOURCES = \
+	$(addprefix ../common/, $(mesa_dri_common_SOURCES))
 
 INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES)
 
@@ -20,13 +22,8 @@ OBJECTS = $(C_SOURCES:.c=.o) \
 ### Include directories
 SHARED_INCLUDES = \
 	-I. \
-	-I$(TOP)/src/mesa/drivers/dri/common \
 	-Iserver \
-	-I$(TOP)/include \
-	-I$(TOP)/src/mapi \
-	-I$(TOP)/src/mesa \
-	-I$(TOP)/src/egl/main \
-	-I$(TOP)/src/egl/drivers/dri \
+	$(addprefix -I, $(mesa_dri_common_INCLUDES)) \
 	$(LIBDRM_CFLAGS)
 
 INCLUDES += $(API_DEFINES)
diff --git a/src/mesa/drivers/dri/common/Makefile.sources b/src/mesa/drivers/dri/common/Makefile.sources
new file mode 100644
index 0000000..bdb6518
--- /dev/null
+++ b/src/mesa/drivers/dri/common/Makefile.sources
@@ -0,0 +1,18 @@
+mesa_dri_common_gallium_SOURCES := \
+	utils.c \
+	vblank.c \
+	dri_util.c \
+	xmlconfig.c
+
+mesa_dri_common_SOURCES := \
+	$(mesa_dri_common_gallium_SOURCES) \
+        texmem.c \
+        drirenderbuffer.c
+
+mesa_dri_common_INCLUDES := \
+	$(MESA_TOP)/include \
+	$(MESA_TOP)/src/egl/drivers/dri \
+	$(MESA_TOP)/src/egl/main \
+	$(MESA_TOP)/src/mapi \
+	$(MESA_TOP)/src/mesa \
+	$(MESA_TOP)/src/mesa/drivers/dri/common \
-- 
1.7.6