gallium: add PIPE_SHADER_CAP_TGSI_SKIP_MERGE_REGISTERS

[mesa.git] / src / gallium / auxiliary / Makefile.am

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index bcdf297030f0699e08f98fc7b3e4003d491ac457..dc4bd4a40cfac0c430f7154d670b082169a20f7e 100644 (file)
--- 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/glsl/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