gallium: implement ARB/KHR_parallel_shader_compile

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

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 97a9bbd8c25f21941dc9a03db15b1c75a56a1470..d7daa995c5c6449808df0d8773b9c95288ee3a6d 100644 (file)
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -21,6 +21,11 @@
 
 SUBDIRS = . main/tests
 
+# state tracker tests depend on libmesagallium.la
+if HAVE_GALLIUM
+SUBDIRS += state_tracker/tests
+endif
+
 if HAVE_XLIB_GLX
 SUBDIRS += drivers/x11
 endif
@@ -37,6 +42,9 @@ include Makefile.sources
 
 EXTRA_DIST = \
        drivers/SConscript \
+       main/meson.build \
+       program/meson.build \
+       meson.build \
        main/format_fallback.py \
        main/format_info.py \
        main/format_pack.py \
@@ -65,7 +73,7 @@ CLEANFILES = \
        $(BUILT_SOURCES) \
        program/program_parse.tab.h
 
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
+PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
 
 main/get_hash.h: ../mapi/glapi/gen/gl_and_es_API.xml main/get_hash_params.py \
                  main/get_hash_generator.py