allow make to build lp_test_* for llvmpipe

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

diff --git a/configs/linux-llvm b/configs/linux-llvm
index 988b7057d4efcbf9d48a1e68e35bd38c81ee9d19..4bb5ff8868fd6c83ebd6895fc8fc2a5949b42e2c 100644 (file)
--- 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 899af6acf843459b466ad95278eb29759968b572..698078bc3765d468160e76b49d2ead3ace70dcff 100644 (file)
--- 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)