Mesa (master): dri: don't link with DRICORE_LIB_DEPS

Matt Turner mattst88 at kemper.freedesktop.org
Sun Jan 29 03:02:28 UTC 2012


Module: Mesa
Branch: master
Commit: 10c85526a23ab6c01a67562a885597ad65883be6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=10c85526a23ab6c01a67562a885597ad65883be6

Author: Matt Turner <mattst88 at gmail.com>
Date:   Sat Jan 28 22:00:29 2012 -0500

dri: don't link with DRICORE_LIB_DEPS

DRI_LIB_DEPS is sufficient since it includes DRICORE_LIB_DEPS

---

 src/mesa/drivers/dri/i915/Makefile.am    |    1 -
 src/mesa/drivers/dri/i965/Makefile.am    |    1 -
 src/mesa/drivers/dri/nouveau/Makefile.am |    1 -
 src/mesa/drivers/dri/r200/Makefile.am    |    1 -
 src/mesa/drivers/dri/radeon/Makefile.am  |    1 -
 src/mesa/drivers/dri/swrast/Makefile.am  |    3 +--
 6 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am
index bcfde69..75267e2 100644
--- a/src/mesa/drivers/dri/i915/Makefile.am
+++ b/src/mesa/drivers/dri/i915/Makefile.am
@@ -53,7 +53,6 @@ i915_dri_la_SOURCES = \
 i915_dri_la_LDFLAGS = -module -avoid-version -shared
 i915_dri_la_LIBADD = \
 	$(DRI_LIB_DEPS) \
-	$(DRICORE_LIB_DEPS) \
 	$(INTEL_LIBS) \
 	../common/libdricommon.la
 
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 4f6280d..f5dfced 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -54,7 +54,6 @@ i965_dri_la_SOURCES = \
 i965_dri_la_LDFLAGS = -module -avoid-version -shared
 i965_dri_la_LIBADD = \
 	$(DRI_LIB_DEPS) \
-	$(DRICORE_LIB_DEPS) \
 	$(INTEL_LIBS) \
 	../common/libdricommon.la
 
diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am
index 1d9de50..3a3c0af 100644
--- a/src/mesa/drivers/dri/nouveau/Makefile.am
+++ b/src/mesa/drivers/dri/nouveau/Makefile.am
@@ -49,7 +49,6 @@ nouveau_vieux_dri_la_SOURCES = \
 nouveau_vieux_dri_la_LDFLAGS = -module -avoid-version -shared
 nouveau_vieux_dri_la_LIBADD = \
 	$(DRI_LIB_DEPS) \
-	$(DRICORE_LIB_DEPS) \
 	$(NOUVEAU_LIBS) \
 	../common/libdricommon.la
 
diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am
index d128dee..f15dbc0 100644
--- a/src/mesa/drivers/dri/r200/Makefile.am
+++ b/src/mesa/drivers/dri/r200/Makefile.am
@@ -51,7 +51,6 @@ r200_dri_la_SOURCES = \
 r200_dri_la_LDFLAGS = -module -avoid-version -shared
 r200_dri_la_LIBADD = \
 	$(DRI_LIB_DEPS) \
-	$(DRICORE_LIB_DEPS) \
 	$(RADEON_LIBS) \
 	../common/libdricommon.la
 
diff --git a/src/mesa/drivers/dri/radeon/Makefile.am b/src/mesa/drivers/dri/radeon/Makefile.am
index 56f6d39..89b778d 100644
--- a/src/mesa/drivers/dri/radeon/Makefile.am
+++ b/src/mesa/drivers/dri/radeon/Makefile.am
@@ -51,7 +51,6 @@ radeon_dri_la_SOURCES = \
 radeon_dri_la_LDFLAGS = -module -avoid-version -shared
 radeon_dri_la_LIBADD = \
 	$(DRI_LIB_DEPS) \
-	$(DRICORE_LIB_DEPS) \
 	$(RADEON_LIBS) \
 	../common/libdricommon.la
 
diff --git a/src/mesa/drivers/dri/swrast/Makefile.am b/src/mesa/drivers/dri/swrast/Makefile.am
index 0a28004..3dc7c10 100644
--- a/src/mesa/drivers/dri/swrast/Makefile.am
+++ b/src/mesa/drivers/dri/swrast/Makefile.am
@@ -48,8 +48,7 @@ swrast_dri_la_SOURCES = \
 
 swrast_dri_la_LDFLAGS = -module -avoid-version -shared
 swrast_dri_la_LIBADD = \
-	$(DRI_LIB_DEPS) \
-	$(DRICORE_LIB_DEPS)
+	$(DRI_LIB_DEPS)
 
 # 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.




More information about the mesa-commit mailing list