Mesa (master): allow make to build lp_test_* for llvmpipe

[Jose Fonseca]

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

Author: Chris Li <chrisl at vmware.com>
Date:   Fri Feb  5 01:29:43 2010 -0800

allow make to build lp_test_* for llvmpipe

Signed-off-by: José Fonseca <jfonseca at vmware.com>

---

 configs/linux-llvm                    |    2 +-
 src/gallium/drivers/llvmpipe/Makefile |   13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/configs/linux-llvm b/configs/linux-llvm
index 988b705..4bb5ff8 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -31,7 +31,7 @@ ifeq ($(MESA_LLVM),1)
 #  LLVM_CFLAGS=`llvm-config --cflags`
   LLVM_CXXFLAGS=`llvm-config --cxxflags backend bitreader engine ipo interpreter instrumentation` -Wno-long-long
   LLVM_LDFLAGS = $(shell llvm-config --ldflags backend bitreader engine ipo interpreter instrumentation)
-  LLVM_LIBS = $(shell llvm-config --libs backend bitreader engine ipo interpreter instrumentation)
+  LLVM_LIBS = $(shell llvm-config --libs backend bitwriter bitreader engine ipo interpreter instrumentation)
   MKLIB_OPTIONS=-cplusplus
 else
   LLVM_CFLAGS=
diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile
index 899af6a..698078b 100644
--- a/src/gallium/drivers/llvmpipe/Makefile
+++ b/src/gallium/drivers/llvmpipe/Makefile
@@ -74,3 +74,16 @@ lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py ../../auxil
 # to make a .s file to inspect assembly code
 .c.s:
 	$(CC) -S $(INCLUDES) $(DEFINES) $(CFLAGS) $(LIBRARY_DEFINES) $<
+
+
+testprogs := lp_test_format	\
+	     lp_test_blend	\
+	     lp_test_conv
+
+LIBS += $(GL_LIB_DEPS) -L. -lllvmpipe -L../../auxiliary/ -lgallium
+
+$(testprogs): lp_test_% : lp_test_%.o lp_test_main.o
+	$(LD) $^ -o $@ -Wl,--start-group  $(LIBS) -Wl,--end-group
+
+
+default: $(testprogs)