From 16f442e9d58cc50a40d1f85e90a13a909fc9cab1 Mon Sep 17 00:00:00 2001
From: Chad Versace <chad@chad-versace.us>
Date: Thu, 25 Aug 2011 17:55:42 -0700
Subject: [PATCH] make: Factor out source lists from drivers/dri/common into
 Makefile.sources

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 reuse.

Reviewed-by: Chia-I Wu <olv@lunarg.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off: Chad Versace <chad@chad-versace.us>
---
 src/mesa/drivers/dri/Makefile.defines        | 20 +++++++-------------
 src/mesa/drivers/dri/common/Makefile.sources | 19 +++++++++++++++++++
 2 files changed, 26 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 90ae55101d2..6ff8df5c0cb 100644
--- a/src/mesa/drivers/dri/Makefile.defines
+++ b/src/mesa/drivers/dri/Makefile.defines
@@ -1,14 +1,13 @@
 # -*-makefile-*-
 
+# Import mesa_dri_common_*
+include ../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 +19,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$(TOP)/, $(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 00000000000..3432dda4575
--- /dev/null
+++ b/src/mesa/drivers/dri/common/Makefile.sources
@@ -0,0 +1,19 @@
+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
+
+# Paths are relative to MESA_TOP.
+mesa_dri_common_INCLUDES := \
+	include \
+	src/egl/drivers/dri \
+	src/egl/main \
+	src/mapi \
+	src/mesa \
+	src/mesa/drivers/dri/common
-- 
2.30.2