diff options
author | Matt Turner <mattst88@gmail.com> | 2012-10-01 13:00:18 -0700 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2012-10-03 13:41:09 -0700 |
commit | 31ab61cac10bf75210134b6d8a354ac3cbd3b4da (patch) | |
tree | 5c83b24f296935a55466b7188e1780ac0890de93 | |
parent | 551c991606e543c3a264a762026f11348b37947e (diff) | |
download | external_mesa3d-31ab61cac10bf75210134b6d8a354ac3cbd3b4da.zip external_mesa3d-31ab61cac10bf75210134b6d8a354ac3cbd3b4da.tar.gz external_mesa3d-31ab61cac10bf75210134b6d8a354ac3cbd3b4da.tar.bz2 |
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>
-rw-r--r-- | src/mesa/drivers/dri/i915/Makefile.am | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.am | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/nouveau/Makefile.am | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/r200/Makefile.am | 4 | ||||
-rw-r--r-- | 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 85bb09e..32986d1 100644 --- 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 574a499..2cdfb51 100644 --- 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 a1c2068..8bfbf92 100644 --- 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 1819f17..c8947a8 100644 --- 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 3980f92..f93dcf4 100644 --- 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. |