python: Better iterate over dictionaries

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

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 6d7a3cc9486e1e6a67a58d56bfda6010ca9d8f6f..195e44003559c50c5aa1f990d59391c03a9ccf8e 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
@@ -33,13 +38,14 @@ if HAVE_OSMESA
 SUBDIRS += drivers/osmesa
 endif
 
-gldir = $(includedir)/GL
-gl_HEADERS = $(top_srcdir)/include/GL/*.h
-
 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 \
        main/format_parser.py \
@@ -57,6 +63,7 @@ EXTRA_DIST = \
 
 BUILT_SOURCES = \
        main/get_hash.h \
+       main/format_fallback.c \
        main/format_info.h \
        main/format_pack.c \
        main/format_unpack.c \
@@ -73,6 +80,11 @@ main/get_hash.h: ../mapi/glapi/gen/gl_and_es_API.xml main/get_hash_params.py \
        $(PYTHON_GEN) $(srcdir)/main/get_hash_generator.py \
                -f $(srcdir)/../mapi/glapi/gen/gl_and_es_API.xml > $@
 
+main/format_fallback.c: main/format_fallback.py \
+                        main/format_parser.py \
+                       main/formats.csv
+       $(PYTHON_GEN) $(srcdir)/main/format_fallback.py $(srcdir)/main/formats.csv $@
+
 main/format_info.h: main/formats.csv \
                     main/format_parser.py main/format_info.py
        $(PYTHON_GEN) $(srcdir)/main/format_info.py $(srcdir)/main/formats.csv > $@
@@ -99,6 +111,7 @@ endif
 
 AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS)
 AM_CFLAGS = \
+       $(VDPAU_CFLAGS) \
        $(LLVM_CFLAGS) \
        $(VISIBILITY_CFLAGS) \
        $(MSVC2013_COMPAT_CFLAGS)
@@ -159,9 +172,6 @@ libmesa_sse41_la_SOURCES = \
 
 libmesa_sse41_la_CFLAGS = $(AM_CFLAGS) $(SSE41_CFLAGS)
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gl.pc
-
 MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
 YACC_GEN = $(AM_V_GEN)$(YACC) $(YFLAGS)
 LEX_GEN = $(AM_V_GEN)$(LEX) $(LFLAGS)