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 698078bc3765d468160e76b49d2ead3ace70dcff..a35a24f5b06ff723e376996e367041bc12b78972 100644 (file)
--- a/src/gallium/drivers/llvmpipe/Makefile
+++ b/src/gallium/drivers/llvmpipe/Makefile
@@ -6,30 +6,6 @@ LIBNAME = llvmpipe
 DEFINES += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
 
 C_SOURCES = \
-       lp_bld_alpha.c \
-       lp_bld_arit.c \
-       lp_bld_blend_aos.c \
-       lp_bld_blend_logicop.c \
-       lp_bld_blend_soa.c \
-       lp_bld_const.c \
-       lp_bld_conv.c \
-       lp_bld_debug.c \
-       lp_bld_depth.c \
-       lp_bld_flow.c \
-       lp_bld_format_aos.c \
-       lp_bld_format_query.c \
-       lp_bld_format_soa.c \
-       lp_bld_interp.c \
-       lp_bld_intr.c \
-       lp_bld_logic.c \
-       lp_bld_pack.c \
-       lp_bld_sample.c \
-       lp_bld_sample_soa.c \
-       lp_bld_swizzle.c \
-       lp_bld_struct.c \
-       lp_bld_tgsi_soa.c \
-       lp_bld_type.c \
-       lp_buffer.c \
        lp_clear.c \
        lp_context.c \
        lp_draw_arrays.c \
@@ -60,30 +36,24 @@ C_SOURCES = \
        lp_surface.c \
        lp_tex_sample_llvm.c \
        lp_texture.c \
+       lp_tile_image.c \
        lp_tile_soa.c
 
 CPP_SOURCES = \
-       lp_bld_misc.cpp
 
-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
-       python lp_tile_soa.py ../../auxiliary/util/u_format.csv > $@
+PROGS := \
+        lp_test_blend  \
+        lp_test_conv   \
+        lp_test_printf
 
 
-# to make a .s file to inspect assembly code
-.c.s:
-       $(CC) -S $(INCLUDES) $(DEFINES) $(CFLAGS) $(LIBRARY_DEFINES) $<
-
+include ../../Makefile.template
 
-testprogs := lp_test_format    \
-            lp_test_blend      \
-            lp_test_conv
+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 > $@
 
-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
+LIBS += $(GL_LIB_DEPS) -L../../auxiliary/ -lgallium
 
+$(PROGS): lp_test_main.o
 
-default: $(testprogs)