Squashed commit of the following:

[mesa.git] / src / gallium / drivers / llvmpipe / Makefile

diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile
index e880042b71e9910fd696a8532185dcc4654f92ab..a35a24f5b06ff723e376996e367041bc12b78972 100644 (file)
--- a/src/gallium/drivers/llvmpipe/Makefile
+++ b/src/gallium/drivers/llvmpipe/Makefile
@@ -6,7 +6,6 @@ LIBNAME = llvmpipe
 DEFINES += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
 
 C_SOURCES = \
-       lp_buffer.c \
        lp_clear.c \
        lp_context.c \
        lp_draw_arrays.c \
@@ -37,30 +36,24 @@ C_SOURCES = \
        lp_surface.c \
        lp_tex_sample_llvm.c \
        lp_texture.c \
-       lp_tile_surface.c \
+       lp_tile_image.c \
        lp_tile_soa.c
 
 CPP_SOURCES = \
 
+PROGS := \
+        lp_test_blend  \
+        lp_test_conv   \
+        lp_test_printf
+
 
 include ../../Makefile.template
 
-lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py ../../auxiliary/util/u_format_access.py ../../auxiliary/util/u_format.csv
+lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py ../../auxiliary/util/u_format_pack.py ../../auxiliary/util/u_format.csv
        python lp_tile_soa.py ../../auxiliary/util/u_format.csv > $@
 
 
-# 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
+LIBS += $(GL_LIB_DEPS) -L../../auxiliary/ -lgallium
 
-$(testprogs): lp_test_% : lp_test_%.o lp_test_main.o libllvmpipe.a
-       $(LD) $(filter %.o,$^) -o $@ -Wl,--start-group  $(LIBS) -Wl,--end-group
+$(PROGS): lp_test_main.o
 
-default: $(testprogs)