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 6ec97046e15a4c57930dd789d310c513f5ba8c07..a35a24f5b06ff723e376996e367041bc12b78972 100644 (file)
--- a/src/gallium/drivers/llvmpipe/Makefile
+++ b/src/gallium/drivers/llvmpipe/Makefile
@@ -3,47 +3,27 @@ include $(TOP)/configs/current
 
 LIBNAME = llvmpipe
 
-CFLAGS += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
+DEFINES += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
 
 C_SOURCES = \
-       lp_scene.c \
-       lp_scene_queue.c \
-       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_soa.c \
-       lp_bld_interp.c \
-       lp_bld_intr.c \
-       lp_bld_logic.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 \
        lp_fence.c \
        lp_flush.c \
        lp_jit.c \
+       lp_perf.c \
+       lp_query.c \
        lp_rast.c \
        lp_rast_tri.c \
+       lp_scene.c \
+       lp_scene_queue.c \
+       lp_screen.c \
        lp_setup.c \
        lp_setup_line.c \
        lp_setup_point.c \
        lp_setup_tri.c \
        lp_setup_vbuf.c \
-       lp_query.c \
-       lp_screen.c \
        lp_state_blend.c \
        lp_state_clip.c \
        lp_state_derived.c \
@@ -56,9 +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 = \
+
+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 > $@
+
+
+LIBS += $(GL_LIB_DEPS) -L../../auxiliary/ -lgallium
+
+$(PROGS): lp_test_main.o
+