X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fllvmpipe%2FMakefile;h=8df891cd1b24c2e250c6fe474e8c261ba04eeb7b;hb=978c1aa1d0f6fd9a188762a8534de33fc63eeea0;hp=4a3fc036c490fc768c84d548b8e6932cd93b5773;hpb=e4c54d404959aa1bce26caa313c0a47e65ff211a;p=mesa.git

diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile
index 4a3fc036c49..8df891cd1b2 100644
--- a/src/gallium/drivers/llvmpipe/Makefile
+++ b/src/gallium/drivers/llvmpipe/Makefile
@@ -3,8 +3,6 @@ include $(TOP)/configs/current
 
 LIBNAME = llvmpipe
 
-DEFINES += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
-
 C_SOURCES = \
 	lp_bld_alpha.c \
 	lp_bld_blend_aos.c \
@@ -18,9 +16,11 @@ C_SOURCES = \
 	lp_fence.c \
 	lp_flush.c \
 	lp_jit.c \
+	lp_memory.c \
 	lp_perf.c \
 	lp_query.c \
 	lp_rast.c \
+	lp_rast_debug.c \
 	lp_rast_tri.c \
 	lp_scene.c \
 	lp_scene_queue.c \
@@ -34,13 +34,16 @@ C_SOURCES = \
 	lp_state_clip.c \
 	lp_state_derived.c \
 	lp_state_fs.c \
+	lp_state_setup.c \
+	lp_state_gs.c \
 	lp_state_rasterizer.c \
 	lp_state_sampler.c \
+        lp_state_so.c \
 	lp_state_surface.c \
 	lp_state_vertex.c \
 	lp_state_vs.c \
 	lp_surface.c \
-	lp_tex_sample_llvm.c \
+	lp_tex_sample.c \
 	lp_texture.c \
 	lp_tile_image.c \
 	lp_tile_soa.c
@@ -48,18 +51,28 @@ C_SOURCES = \
 CPP_SOURCES = \
 
 PROGS := lp_test_format	\
+	 lp_test_arit	\
 	 lp_test_blend	\
 	 lp_test_conv	\
-	 lp_test_printf
+	 lp_test_printf \
+	 lp_test_round
 
+# Need this for the lp_test_*.o files
+CLEAN_EXTRA = *.o
 
 include ../../Makefile.template
 
-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 > $@
+# FIXME: Remove when this driver is converted to automake.
+all: default
 
+PROGS_DEPS := ../../auxiliary/libgallium.a
+
+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
+	$(PYTHON2) $(PYTHON_FLAGS) lp_tile_soa.py ../../auxiliary/util/u_format.csv > $@
 
-LIBS += $(GL_LIB_DEPS) -L../../auxiliary/ -lgallium libllvmpipe.a
+LDFLAGS += $(LLVM_LDFLAGS)
+LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a $(LLVM_LIBS) $(GL_LIB_DEPS)
+LD=$(CXX)
 
 $(PROGS): lp_test_main.o libllvmpipe.a