summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2012-01-28 22:00:29 -0500
committerMatt Turner <[email protected]>2012-01-28 22:02:08 -0500
commit10c85526a23ab6c01a67562a885597ad65883be6 (patch)
tree8dd43a0efaba4da51dc8ba5828ad038682a6a4c7
parent335d49ef1581c2954cfa17a5c603ca54dd770a89 (diff)
dri: don't link with DRICORE_LIB_DEPS
DRI_LIB_DEPS is sufficient since it includes DRICORE_LIB_DEPS
-rw-r--r--src/mesa/drivers/dri/i915/Makefile.am1
-rw-r--r--src/mesa/drivers/dri/i965/Makefile.am1
-rw-r--r--src/mesa/drivers/dri/nouveau/Makefile.am1
-rw-r--r--src/mesa/drivers/dri/r200/Makefile.am1
-rw-r--r--src/mesa/drivers/dri/radeon/Makefile.am1
-rw-r--r--src/mesa/drivers/dri/swrast/Makefile.am3
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 bcfde69d700..75267e22196 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 4f6280d3a32..f5dfced9996 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 1d9de507d90..3a3c0af9a71 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 d128deedd4b..f15dbc09ac2 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 56f6d392083..89b778d5110 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 0a2800440d2..3dc7c104440 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.