Mesa (9.0): dri drivers: Link dricommon before dynamic libraries

[Matt Turner]

Module: Mesa
Branch: 9.0
Commit: 89e76252ca3fd015544f76d0f528babe9c723938
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=89e76252ca3fd015544f76d0f528babe9c723938

Author: Matt Turner <mattst88 at gmail.com>
Date:   Mon Oct  1 13:00:18 2012 -0700

dri drivers: Link dricommon before dynamic libraries

I think libtool should be handling this for us, but the build fails for
Jordan because libdricommon (a static library, which uses expat) appears
before -lexpat on the linker command.

Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Tested-by: Jordan Justen <jordan.l.justen at intel.com>
(cherry picked from commit 31ab61cac10bf75210134b6d8a354ac3cbd3b4da)

Conflicts:

	src/mesa/drivers/dri/i965/Makefile.am

---

 src/mesa/drivers/dri/i915/Makefile.am    |    4 ++--
 src/mesa/drivers/dri/i965/Makefile.am    |    4 ++--
 src/mesa/drivers/dri/nouveau/Makefile.am |    4 ++--
 src/mesa/drivers/dri/r200/Makefile.am    |    4 ++--
 src/mesa/drivers/dri/radeon/Makefile.am  |    4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am
index 7ec4c22..cbdcf84 100644
--- a/src/mesa/drivers/dri/i915/Makefile.am
+++ b/src/mesa/drivers/dri/i915/Makefile.am
@@ -51,9 +51,9 @@ i915_dri_la_SOURCES = \
 
 i915_dri_la_LDFLAGS = -module -avoid-version -shared
 i915_dri_la_LIBADD = \
+	../common/libdricommon.la \
 	$(DRI_LIB_DEPS) \
-	$(INTEL_LIBS) \
-	../common/libdricommon.la
+	$(INTEL_LIBS)
 
 # 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 c1526ae..c9ea1c3 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -52,9 +52,9 @@ i965_dri_la_SOURCES = \
 
 i965_dri_la_LDFLAGS = -module -avoid-version -shared
 i965_dri_la_LIBADD = \
+	../common/libdricommon.la \
 	$(DRI_LIB_DEPS) \
-	$(INTEL_LIBS) \
-	../common/libdricommon.la
+	$(INTEL_LIBS)
 
 # 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/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am
index 82d3804..4589b05 100644
--- a/src/mesa/drivers/dri/nouveau/Makefile.am
+++ b/src/mesa/drivers/dri/nouveau/Makefile.am
@@ -47,9 +47,9 @@ nouveau_vieux_dri_la_SOURCES = \
 
 nouveau_vieux_dri_la_LDFLAGS = -module -avoid-version -shared
 nouveau_vieux_dri_la_LIBADD = \
+	../common/libdricommon.la \
 	$(DRI_LIB_DEPS) \
-	$(NOUVEAU_LIBS) \
-	../common/libdricommon.la
+	$(NOUVEAU_LIBS)
 
 # 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/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am
index 5ec53de..8920ab0 100644
--- a/src/mesa/drivers/dri/r200/Makefile.am
+++ b/src/mesa/drivers/dri/r200/Makefile.am
@@ -49,9 +49,9 @@ r200_dri_la_SOURCES = \
 
 r200_dri_la_LDFLAGS = -module -avoid-version -shared
 r200_dri_la_LIBADD = \
+	../common/libdricommon.la \
 	$(DRI_LIB_DEPS) \
-	$(RADEON_LIBS) \
-	../common/libdricommon.la
+	$(RADEON_LIBS)
 
 # 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/radeon/Makefile.am b/src/mesa/drivers/dri/radeon/Makefile.am
index ec2d42e..36b852e 100644
--- a/src/mesa/drivers/dri/radeon/Makefile.am
+++ b/src/mesa/drivers/dri/radeon/Makefile.am
@@ -49,9 +49,9 @@ radeon_dri_la_SOURCES = \
 
 radeon_dri_la_LDFLAGS = -module -avoid-version -shared
 radeon_dri_la_LIBADD = \
+	../common/libdricommon.la \
 	$(DRI_LIB_DEPS) \
-	$(RADEON_LIBS) \
-	../common/libdricommon.la
+	$(RADEON_LIBS)
 
 # 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.