From 31ab61cac10bf75210134b6d8a354ac3cbd3b4da Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 1 Oct 2012 13:00:18 -0700 Subject: 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 Tested-by: Jordan Justen --- 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(-) (limited to 'src/mesa/drivers/dri') diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am index 85bb09e5e94..32986d1c87b 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 574a4992e7a..2cdfb515f53 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 a1c20684b4c..8bfbf92ad18 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 1819f1763c3..c8947a82cc3 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 3980f925d4d..f93dcf4cfc1 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. -- cgit v1.2.3