X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fauxiliary%2FMakefile.am;h=dc4bd4a40cfac0c430f7154d670b082169a20f7e;hb=3a927e0aa34d2d27583063732eadfddccd1ebdd2;hp=0ac5c9802f295b4de6b730983126c61cbc9f6cba;hpb=a39a8fbbaa129f4e52f2a3ad2747182e9a74d910;p=mesa.git

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 0ac5c9802f2..dc4bd4a40cf 100644
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -1,38 +1,37 @@
 include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
-noinst_LTLIBRARIES = libgallium_nir.la
+noinst_LTLIBRARIES = libgallium.la
 
 AM_CFLAGS = \
 	-I$(top_srcdir)/src/loader \
+	-I$(top_builddir)/src/compiler/nir \
 	-I$(top_srcdir)/src/gallium/auxiliary/util \
 	$(GALLIUM_CFLAGS) \
+	$(LIBUNWIND_CFLAGS) \
 	$(VISIBILITY_CFLAGS) \
-	$(MSVC2008_COMPAT_CFLAGS)
+	$(MSVC2013_COMPAT_CFLAGS)
 
 AM_CXXFLAGS = \
 	$(VISIBILITY_CXXFLAGS) \
-	$(MSVC2008_COMPAT_CXXFLAGS)
-
-libgallium_nir_la_SOURCES = \
-	$(NIR_SOURCES)
-
-libgallium_nir_la_CFLAGS = \
-	-I$(top_builddir)/src/compiler/nir \
-	$(GALLIUM_CFLAGS) \
-	$(VISIBILITY_CFLAGS) \
-	$(MSVC2013_COMPAT_CFLAGS)
-
-noinst_LTLIBRARIES += libgallium.la
+	$(MSVC2013_COMPAT_CXXFLAGS)
 
 libgallium_la_SOURCES = \
 	$(C_SOURCES) \
+	$(NIR_SOURCES) \
 	$(GENERATED_SOURCES)
 
-libgallium_la_LIBADD = \
-	libgallium_nir.la
+if HAVE_LIBDRM
+
+AM_CFLAGS += \
+	$(LIBDRM_CFLAGS)
+
+libgallium_la_SOURCES += \
+	$(RENDERONLY_SOURCES)
+
+endif
 
-if HAVE_MESA_LLVM
+if HAVE_GALLIUM_LLVM
 
 AM_CFLAGS += \
 	$(LLVM_CFLAGS)
@@ -94,6 +93,13 @@ libgalliumvlwinsys_la_CFLAGS = \
 libgalliumvlwinsys_la_SOURCES = \
 	$(VL_WINSYS_SOURCES)
 
+if HAVE_DRI3
+
+libgalliumvlwinsys_la_SOURCES += \
+	$(VL_WINSYS_DRI3_SOURCES)
+
+endif
+
 endif
 
 endif