X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fllvmpipe%2FMakefile.am;h=d649fa44b9579561477aca33ab88f3ba95eaf530;hb=ae2cb7280436ab3fe24afef510d30201e54b795c;hp=1514f1634b3a11a8475e4f7c5d6706e077eab7f0;hpb=960cbd8b780ef00176fc353f670b6c6487e41967;p=mesa.git

diff --git a/src/gallium/drivers/llvmpipe/Makefile.am b/src/gallium/drivers/llvmpipe/Makefile.am
index 1514f1634b3..d649fa44b95 100644
--- a/src/gallium/drivers/llvmpipe/Makefile.am
+++ b/src/gallium/drivers/llvmpipe/Makefile.am
@@ -20,63 +20,26 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/include \
-	$(GALLIUM_CFLAGS)
-AM_CFLAGS = $(LLVM_CFLAGS)
-AM_CXXFLAGS= $(LLVM_CXXFLAGS)
+AM_CFLAGS = \
+	$(GALLIUM_DRIVER_CFLAGS) \
+	$(LLVM_CFLAGS) \
+	$(MSVC2013_COMPAT_CFLAGS)
+AM_CXXFLAGS= \
+	$(GALLIUM_DRIVER_CXXFLAGS) \
+	$(LLVM_CXXFLAGS) \
+	$(MSVC2013_COMPAT_CXXFLAGS)
 
 noinst_LTLIBRARIES = libllvmpipe.la
 
-libllvmpipe_la_SOURCES = \
-	lp_bld_alpha.c \
-	lp_bld_blend.c \
-	lp_bld_blend_aos.c \
-	lp_bld_blend_logicop.c \
-	lp_bld_depth.c \
-	lp_bld_interp.c \
-	lp_clear.c \
-	lp_context.c \
-	lp_draw_arrays.c \
-	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 \
-	lp_screen.c \
-	lp_setup.c \
-	lp_setup_line.c \
-	lp_setup_point.c \
-	lp_setup_tri.c \
-	lp_setup_vbuf.c \
-	lp_state_blend.c \
-	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.c \
-	lp_texture.c \
-	lp_tile_image.c
+libllvmpipe_la_SOURCES = $(C_SOURCES)
 
 libllvmpipe_la_LDFLAGS = $(LLVM_LDFLAGS)
 
+noinst_HEADERS = lp_test.h
+
 check_PROGRAMS = \
 	lp_test_format	\
 	lp_test_arit	\
@@ -85,25 +48,33 @@ check_PROGRAMS = \
 	lp_test_printf
 TESTS = $(check_PROGRAMS)
 
+TEST_LIBS = \
+	libllvmpipe.la \
+	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+	$(top_builddir)/src/util/libmesautil.la \
+	$(LLVM_LIBS) \
+	$(DLOPEN_LIBS) \
+	$(PTHREAD_LIBS) \
+	$(CLOCK_LIB)
+
 lp_test_format_SOURCES = lp_test_format.c lp_test_main.c
-lp_test_format_LDADD = libllvmpipe.la ../../auxiliary/libgallium.la $(LLVM_LIBS)
+lp_test_format_LDADD = $(TEST_LIBS)
 nodist_EXTRA_lp_test_format_SOURCES = dummy.cpp
 
 lp_test_arit_SOURCES = lp_test_arit.c lp_test_main.c
-lp_test_arit_LDADD = libllvmpipe.la ../../auxiliary/libgallium.la $(LLVM_LIBS)
+lp_test_arit_LDADD = $(TEST_LIBS)
 nodist_EXTRA_lp_test_arit_SOURCES = dummy.cpp
 
 lp_test_blend_SOURCES = lp_test_blend.c lp_test_main.c
-lp_test_blend_LDADD = libllvmpipe.la ../../auxiliary/libgallium.la $(LLVM_LIBS)
+lp_test_blend_LDADD = $(TEST_LIBS)
 nodist_EXTRA_lp_test_blend_SOURCES = dummy.cpp
 
 lp_test_conv_SOURCES = lp_test_conv.c lp_test_main.c
-lp_test_conv_LDADD = libllvmpipe.la ../../auxiliary/libgallium.la $(LLVM_LIBS)
+lp_test_conv_LDADD = $(TEST_LIBS)
 nodist_EXTRA_lp_test_conv_SOURCES = dummy.cpp
 
 lp_test_printf_SOURCES = lp_test_printf.c lp_test_main.c
-lp_test_printf_LDADD = libllvmpipe.la ../../auxiliary/libgallium.la $(LLVM_LIBS)
+lp_test_printf_LDADD = $(TEST_LIBS)
 nodist_EXTRA_lp_test_printf_SOURCES = dummy.cpp
 
-all-local: libllvmpipe.la
-	ln -f $(builddir)/.libs/libllvmpipe.a $(builddir)/libllvmpipe.a
+EXTRA_DIST = SConscript meson.build