Mesa (master): gallium/targets: do not link every driver with libllvmpipe.a

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 67aba799bc9f32bf60b1587bc7e6072dfadff13d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=67aba799bc9f32bf60b1587bc7e6072dfadff13d

Author: Marek Olšák <maraeo at gmail.com>
Date:   Mon Jun 27 08:25:09 2011 +0200

gallium/targets: do not link every driver with libllvmpipe.a

Only some targets need that, the others don't.

---

 configure.ac                            |    2 +-
 src/gallium/targets/Makefile.dri        |    1 -
 src/gallium/targets/Makefile.xorg       |    1 -
 src/gallium/targets/dri-i915/Makefile   |    1 +
 src/gallium/targets/dri-i965/Makefile   |    1 +
 src/gallium/targets/dri-swrast/Makefile |    5 +++++
 src/gallium/targets/libgl-xlib/Makefile |    1 +
 7 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 851b8d1..a586f0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1885,7 +1885,7 @@ if test "x$enable_gallium_llvm" = xyes; then
 
 	LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
 	GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
-	DEFINES="$DEFINES -DGALLIUM_LLVMPIPE -D__STDC_CONSTANT_MACROS"
+	DEFINES="$DEFINES -D__STDC_CONSTANT_MACROS"
 	MESA_LLVM=1
     else
 	MESA_LLVM=0
diff --git a/src/gallium/targets/Makefile.dri b/src/gallium/targets/Makefile.dri
index 6c6ad18..857ebfe 100644
--- a/src/gallium/targets/Makefile.dri
+++ b/src/gallium/targets/Makefile.dri
@@ -2,7 +2,6 @@
 
 
 ifeq ($(MESA_LLVM),1)
-PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
 LDFLAGS += $(LLVM_LDFLAGS)
 DRIVER_EXTRAS = $(LLVM_LIBS)
 else
diff --git a/src/gallium/targets/Makefile.xorg b/src/gallium/targets/Makefile.xorg
index 6fad710..025f742 100644
--- a/src/gallium/targets/Makefile.xorg
+++ b/src/gallium/targets/Makefile.xorg
@@ -32,7 +32,6 @@ ifeq ($(MESA_LLVM),1)
 LD = $(CXX)
 LDFLAGS += $(LLVM_LDFLAGS)
 USE_CXX=1
-DRIVER_PIPES += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
 DRIVER_LINKS += $(LLVM_LIBS) -lm -ldl
 endif
 
diff --git a/src/gallium/targets/dri-i915/Makefile b/src/gallium/targets/dri-i915/Makefile
index 9c10d71..2ba3eb6 100644
--- a/src/gallium/targets/dri-i915/Makefile
+++ b/src/gallium/targets/dri-i915/Makefile
@@ -22,6 +22,7 @@ DRIVER_DEFINES = \
 	-DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_GALAHAD -DGALLIUM_SOFTPIPE
 
 ifeq ($(MESA_LLVM),1)
+PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
 DRIVER_DEFINES += -DGALLIUM_LLVMPIPE
 endif
 
diff --git a/src/gallium/targets/dri-i965/Makefile b/src/gallium/targets/dri-i965/Makefile
index 4b50d04..9e75bfe 100644
--- a/src/gallium/targets/dri-i965/Makefile
+++ b/src/gallium/targets/dri-i965/Makefile
@@ -22,6 +22,7 @@ DRIVER_DEFINES = \
 	-DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_GALAHAD -DGALLIUM_SOFTPIPE
 
 ifeq ($(MESA_LLVM),1)
+PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
 DRIVER_DEFINES += -DGALLIUM_LLVMPIPE
 endif
 
diff --git a/src/gallium/targets/dri-swrast/Makefile b/src/gallium/targets/dri-swrast/Makefile
index 45b933e..e83e024 100644
--- a/src/gallium/targets/dri-swrast/Makefile
+++ b/src/gallium/targets/dri-swrast/Makefile
@@ -14,6 +14,11 @@ PIPE_DRIVERS = \
 	$(TOP)/src/gallium/drivers/trace/libtrace.a \
 	$(TOP)/src/gallium/drivers/rbug/librbug.a
 
+ifeq ($(MESA_LLVM),1)
+PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
+DRIVER_DEFINES += -DGALLIUM_LLVMPIPE
+endif
+
 SWRAST_COMMON_GALLIUM_SOURCES = \
 	$(TOP)/src/mesa/drivers/dri/common/utils.c \
 	$(TOP)/src/mesa/drivers/dri/common/drisw_util.c \
diff --git a/src/gallium/targets/libgl-xlib/Makefile b/src/gallium/targets/libgl-xlib/Makefile
index 53a6c33..f8f6c81 100644
--- a/src/gallium/targets/libgl-xlib/Makefile
+++ b/src/gallium/targets/libgl-xlib/Makefile
@@ -55,6 +55,7 @@ LIBS = \
 
 # LLVM
 ifeq ($(MESA_LLVM),1)
+PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
 DEFINES += -DGALLIUM_LLVMPIPE
 GL_LIB_DEPS += $(LLVM_LIBS) 
 LDFLAGS += $(LLVM_LDFLAGS)