[Mesa-dev] [PATCH 1/2] dri: Move the compile of the common files to a convenience library.

[Eric Anholt]

---
 src/mesa/drivers/dri/common/Makefile.am |   17 +++++++++++++++++
 src/mesa/drivers/dri/i915/Makefile.am   |   13 +++----------
 src/mesa/drivers/dri/i965/Makefile.am   |   13 +++----------
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am
index 3b5324d..f900c47 100644
--- a/src/mesa/drivers/dri/common/Makefile.am
+++ b/src/mesa/drivers/dri/common/Makefile.am
@@ -19,4 +19,21 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
+AM_CFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/src/ \
+	-I$(top_srcdir)/src/mapi \
+	-I$(top_srcdir)/src/mesa/ \
+	$(DEFINES) \
+	$(ASM_FLAGS) \
+	$(API_DEFINES) \
+	$(LIBDRM_CFLAGS)
+
 sysconf_DATA = drirc
+
+noinst_LTLIBRARIES = libdricommon.la
+
+libdricommon_la_SOURCES = \
+	utils.c \
+	dri_util.c \
+	xmlconfig.c
diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am
index 5c44a9e..bcfde69 100644
--- a/src/mesa/drivers/dri/i915/Makefile.am
+++ b/src/mesa/drivers/dri/i915/Makefile.am
@@ -46,23 +46,16 @@ if HAVE_I915_DRI
 dri_LTLIBRARIES = i915_dri.la
 endif
 
-# These should be an ltlibrary that's built once.  Let's fix that once
-# the other drivers are converted to automake.
-COMMON_FILES = \
-	../common/utils.c \
-	../common/dri_util.c \
-	../common/xmlconfig.c
-
 i915_dri_la_SOURCES = \
 	$(i915_C_FILES) \
-	$(i915_CXX_FILES) \
-	$(COMMON_FILES)
+	$(i915_CXX_FILES)
 
 i915_dri_la_LDFLAGS = -module -avoid-version -shared
 i915_dri_la_LIBADD = \
 	$(DRI_LIB_DEPS) \
 	$(DRICORE_LIB_DEPS) \
-	$(INTEL_LIBS)
+	$(INTEL_LIBS) \
+	../common/libdricommon.la
 
 # Provide compatibility with scripts for the old Mesa build system for
 # a while by putting a link to the driver into /lib of the build tree.
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 5512381..b1f0a80 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -47,23 +47,16 @@ if HAVE_I965_DRI
 dri_LTLIBRARIES = i965_dri.la
 endif
 
-# These should be an ltlibrary that's built once.  Let's fix that once
-# the other drivers are converted to automake.
-COMMON_FILES = \
-	../common/utils.c \
-	../common/dri_util.c \
-	../common/xmlconfig.c
-
 i965_dri_la_SOURCES = \
 	$(i965_C_FILES) \
-	$(i965_CXX_FILES) \
-	$(COMMON_FILES)
+	$(i965_CXX_FILES)
 
 i965_dri_la_LDFLAGS = -module -avoid-version -shared
 i965_dri_la_LIBADD = \
 	$(DRI_LIB_DEPS) \
 	$(DRICORE_LIB_DEPS) \
-	$(INTEL_LIBS)
+	$(INTEL_LIBS) \
+	../common/libdricommon.la
 
 # Test build to make sure that we didn't leave any undefined symbols in the
 # driver.
-- 
1.7.7.3