nir: Zero local_size const struct for valgrind & nir_serialize

[mesa.git] / src / compiler / Makefile.am

diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am
index 89aa54e0c425cb0c74f4f782e003165263eac3f1..45b9cc58543eded44a78439c94372db362924a6d 100644 (file)
--- a/src/compiler/Makefile.am
+++ b/src/compiler/Makefile.am
@@ -31,13 +31,18 @@ AM_CPPFLAGS = \
        -I$(top_builddir)/src/compiler/glsl\
        -I$(top_srcdir)/src/compiler/glsl\
        -I$(top_srcdir)/src/compiler/glsl/glcpp\
+       -I$(top_builddir)/src/compiler/nir \
+       -I$(top_srcdir)/src/compiler/nir \
+       -I$(top_srcdir)/src/compiler/spirv \
        -I$(top_srcdir)/src/gallium/include \
        -I$(top_srcdir)/src/gallium/auxiliary \
        -I$(top_srcdir)/src/gtest/include \
+       $(VALGRIND_CFLAGS) \
        $(DEFINES)
 
 AM_CFLAGS = \
        $(VISIBILITY_CFLAGS) \
+       $(WNO_OVERRIDE_INIT) \
        $(MSVC2013_COMPAT_CFLAGS)
 
 AM_CXXFLAGS = \
@@ -55,76 +60,8 @@ CLEANFILES =
 EXTRA_DIST = SConscript
 
 MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
-
-include Makefile.glsl.am
-
-noinst_LTLIBRARIES += nir/libnir.la
-
-nir_libnir_la_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -I$(top_builddir)/src/compiler/nir \
-       -I$(top_srcdir)/src/compiler/nir
-
-nir_libnir_la_LIBADD = \
-       libcompiler.la
-
-nir_libnir_la_SOURCES =                                        \
-       $(NIR_FILES)                                    \
-       $(NIR_GENERATED_FILES)
-
 PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
 
-nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py
-       $(MKDIR_GEN)
-       $(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@ || ($(RM) $@; false)
-
-nir/nir_constant_expressions.c: nir/nir_opcodes.py nir/nir_constant_expressions.py
-       $(MKDIR_GEN)
-       $(PYTHON_GEN) $(srcdir)/nir/nir_constant_expressions.py > $@ || ($(RM) $@; false)
-
-nir/nir_opcodes.h: nir/nir_opcodes.py nir/nir_opcodes_h.py
-       $(MKDIR_GEN)
-       $(PYTHON_GEN) $(srcdir)/nir/nir_opcodes_h.py > $@ || ($(RM) $@; false)
-
-nir/nir_opcodes.c: nir/nir_opcodes.py nir/nir_opcodes_c.py
-       $(MKDIR_GEN)
-       $(PYTHON_GEN) $(srcdir)/nir/nir_opcodes_c.py > $@ || ($(RM) $@; false)
-
-nir/nir_opt_algebraic.c: nir/nir_opt_algebraic.py nir/nir_algebraic.py
-       $(MKDIR_GEN)
-       $(PYTHON_GEN) $(srcdir)/nir/nir_opt_algebraic.py > $@ || ($(RM) $@; false)
-
-
-check_PROGRAMS += nir/tests/control_flow_tests
-
-nir_tests_control_flow_tests_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -I$(top_builddir)/src/compiler/nir \
-       -I$(top_srcdir)/src/compiler/nir
-
-nir_tests_control_flow_tests_SOURCES =                 \
-       nir/tests/control_flow_tests.cpp
-nir_tests_control_flow_tests_CFLAGS =                  \
-       $(PTHREAD_CFLAGS)
-nir_tests_control_flow_tests_LDADD =                   \
-       $(top_builddir)/src/gtest/libgtest.la           \
-       nir/libnir.la   \
-       $(top_builddir)/src/util/libmesautil.la         \
-       $(PTHREAD_LIBS)
-
-
-TESTS += nir/tests/control_flow_tests
-
-
-BUILT_SOURCES += $(NIR_GENERATED_FILES)
-CLEANFILES += $(NIR_GENERATED_FILES)
+include Makefile.glsl.am
 
-EXTRA_DIST += \
-       nir/nir_algebraic.py                            \
-       nir/nir_builder_opcodes_h.py                    \
-       nir/nir_constant_expressions.py                 \
-       nir/nir_opcodes.py                              \
-       nir/nir_opcodes_c.py                            \
-       nir/nir_opcodes_h.py                            \
-       nir/nir_opt_algebraic.py                        \
-       nir/tests
+include Makefile.nir.am