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@intel.com>
Tested-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am
index 85bb09e5e94ed89c27647fc4033dc50958abf3c7..32986d1c87b2eef2fae8ea8baf8cba9bbd35ca85 100644 (file)
--- a/src/mesa/drivers/dri/i915/Makefile.am
+++ b/src/mesa/drivers/dri/i915/Makefile.am
@@ -52,9 +52,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 574a4992e7acff9daf8822e6a5a8e7011554c239..2cdfb515f53e968e0e1a80bf07461e1ec69c1849 100644 (file)
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -55,9 +55,9 @@ libi965_dri_la_SOURCES = \
 # list of libs to be linked against by i965_dri.so and i965 test programs.
 COMMON_LIBS = \
        libi965_dri.la \
+       ../common/libdricommon.la \
        $(DRI_LIB_DEPS) \
-       $(INTEL_LIBS) \
-       ../common/libdricommon.la
+       $(INTEL_LIBS)
 
 TEST_LIBS = \
        $(COMMON_LIBS) \

diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am
index a1c20684b4c05848020a2c844504b5d84a0aedf3..8bfbf92ad181136ed6369a9028f67753dc443f43 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/Makefile.am
+++ b/src/mesa/drivers/dri/nouveau/Makefile.am
@@ -48,9 +48,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 1819f1763c3fb427c22e18d29d209e9f61b1d756..c8947a82cc38bf17c9f4fc1feb4996cf1cceb724 100644 (file)
--- a/src/mesa/drivers/dri/r200/Makefile.am
+++ b/src/mesa/drivers/dri/r200/Makefile.am
@@ -50,9 +50,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 3980f925d4d50ca62c73b3b9785c7b28939b464f..f93dcf4cfc1dba9b5155778ba4010823a83d13ea 100644 (file)
--- a/src/mesa/drivers/dri/radeon/Makefile.am
+++ b/src/mesa/drivers/dri/radeon/Makefile.am
@@ -50,9 +50,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.