draw: use util_pstipple_create_fragment_shader

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

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 493d306f61489e2fe3818f643f0e53d0e6a8a574..0ac5c9802f295b4de6b730983126c61cbc9f6cba 100644 (file)
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -1,21 +1,37 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
 include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
-noinst_LTLIBRARIES = libgallium.la
+noinst_LTLIBRARIES = libgallium_nir.la
 
 AM_CFLAGS = \
+       -I$(top_srcdir)/src/loader \
        -I$(top_srcdir)/src/gallium/auxiliary/util \
        $(GALLIUM_CFLAGS) \
-       $(VISIBILITY_CFLAGS)
+       $(VISIBILITY_CFLAGS) \
+       $(MSVC2008_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)
 
-AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
+noinst_LTLIBRARIES += libgallium.la
 
 libgallium_la_SOURCES = \
        $(C_SOURCES) \
        $(GENERATED_SOURCES)
 
+libgallium_la_LIBADD = \
+       libgallium_nir.la
+
 if HAVE_MESA_LLVM
 
 AM_CFLAGS += \
@@ -26,19 +42,72 @@ AM_CXXFLAGS += \
        $(LLVM_CXXFLAGS)
 
 libgallium_la_SOURCES += \
-       $(GALLIVM_SOURCES) \
-       $(GALLIVM_CPP_SOURCES)
+       $(GALLIVM_SOURCES)
 
 endif
 
-indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py
-       $(AM_V_at)$(MKDIR_P) indices
-       $(AM_V_GEN) $(PYTHON2) $< > $@
+MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
+PYTHON_GEN =  $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
+
+indices/u_indices_gen.c: indices/u_indices_gen.py
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) $(srcdir)/indices/u_indices_gen.py > $@
+
+indices/u_unfilled_gen.c: indices/u_unfilled_gen.py
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) $(srcdir)/indices/u_unfilled_gen.py > $@
+
+util/u_format_table.c: util/u_format_table.py \
+                       util/u_format_pack.py \
+                       util/u_format_parse.py \
+                       util/u_format.csv
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@
+
+noinst_LTLIBRARIES += libgalliumvl_stub.la
+libgalliumvl_stub_la_SOURCES = \
+       $(VL_STUB_SOURCES)
+
+if NEED_GALLIUM_VL
 
-indices/u_unfilled_gen.c: $(srcdir)/indices/u_unfilled_gen.py
-       $(AM_V_at)$(MKDIR_P) indices
-       $(AM_V_GEN) $(PYTHON2) $< > $@
+COMMON_VL_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(VL_CFLAGS) \
+       $(DRI2PROTO_CFLAGS) \
+       $(LIBDRM_CFLAGS)
+
+noinst_LTLIBRARIES += libgalliumvl.la
+
+libgalliumvl_la_CFLAGS = \
+       $(COMMON_VL_CFLAGS)
+
+libgalliumvl_la_SOURCES = \
+       $(VL_SOURCES)
+
+if NEED_GALLIUM_VL_WINSYS
+
+noinst_LTLIBRARIES += libgalliumvlwinsys.la
+
+libgalliumvlwinsys_la_CFLAGS = \
+       $(COMMON_VL_CFLAGS)
+
+libgalliumvlwinsys_la_SOURCES = \
+       $(VL_WINSYS_SOURCES)
+
+endif
+
+endif
 
-util/u_format_table.c: $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format_pack.py $(srcdir)/util/u_format_parse.py $(srcdir)/util/u_format.csv
-       $(AM_V_at)$(MKDIR_P) util
-       $(AM_V_GEN) $(PYTHON2) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@
+EXTRA_DIST = \
+       SConscript \
+       indices/u_indices.c \
+       indices/u_unfilled_indices.c \
+       indices/u_indices_gen.py \
+       indices/u_unfilled_gen.py \
+       postprocess/ADDING \
+       rbug/README \
+       target-helpers \
+       util/u_format.csv \
+       util/u_format_pack.py \
+       util/u_format_parse.py \
+       util/u_format_table.py