swr/rast: Fix addPassesToEmitFile usage with llvm-7.0.

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

diff --git a/src/gallium/drivers/llvmpipe/Makefile.am b/src/gallium/drivers/llvmpipe/Makefile.am
index f24bf719b14fa376da942f7436ef1eec59ce315f..d649fa44b9579561477aca33ab88f3ba95eaf530 100644 (file)
--- a/src/gallium/drivers/llvmpipe/Makefile.am
+++ b/src/gallium/drivers/llvmpipe/Makefile.am
@@ -23,12 +23,14 @@
 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
 
@@ -36,6 +38,8 @@ libllvmpipe_la_SOURCES = $(C_SOURCES)
 
 libllvmpipe_la_LDFLAGS = $(LLVM_LDFLAGS)
 
+noinst_HEADERS = lp_test.h
+
 check_PROGRAMS = \
        lp_test_format  \
        lp_test_arit    \
@@ -45,11 +49,13 @@ check_PROGRAMS = \
 TESTS = $(check_PROGRAMS)
 
 TEST_LIBS = \
-           libllvmpipe.la \
-           $(top_builddir)/src/gallium/auxiliary/libgallium.la \
-           $(LLVM_LIBS) \
-           $(DLOPEN_LIBS) \
-           $(PTHREAD_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 = $(TEST_LIBS)
@@ -71,3 +77,4 @@ lp_test_printf_SOURCES = lp_test_printf.c lp_test_main.c
 lp_test_printf_LDADD = $(TEST_LIBS)
 nodist_EXTRA_lp_test_printf_SOURCES = dummy.cpp
 
+EXTRA_DIST = SConscript meson.build