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/i965/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mesa/drivers/dri/i965/Makefile.am') 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) \ -- cgit v1.1