meson: ensure that xmlpool_options.h is generated for gallium targets that need it

[mesa.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 36995e08a45c154c52daee3d59dd56523bb75608..1eda3e581ae2e137b0ba2b5260e293b12d1ae37e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,21 +19,14 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-.PHONY: git_sha1.h.tmp
-git_sha1.h.tmp:
-       @sh $(top_srcdir)/git_sha1_gen.sh > $@
-
-git_sha1.h: git_sha1.h.tmp
-       @echo "updating git_sha1.h"
-       @if ! cmp -s git_sha1.h.tmp git_sha1.h; then \
-               mv git_sha1.h.tmp git_sha1.h ;\
-       else \
-               rm git_sha1.h.tmp ;\
-       fi
+.PHONY: git_sha1.h
+git_sha1.h:
+       @echo "updating $@"
+       @$(PYTHON) $(top_srcdir)/bin/git_sha1_gen.py --output $@
 
 BUILT_SOURCES = git_sha1.h
 CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST =
+EXTRA_DIST = meson.build
 
 SUBDIRS = . gtest util mapi/glapi/gen mapi
 
@@ -46,6 +39,7 @@ gl_HEADERS = \
   $(top_srcdir)/include/GL/gl_mangle.h
 endif
 
+# TODO: When building with glvnd, glvnd itself should be providing gl.pc and the headers
 if HAVE_GLX
 glxdir = $(includedir)/GL
 glx_HEADERS = \
@@ -64,7 +58,7 @@ endif
 # include only conditionally ?
 SUBDIRS += compiler
 
-## Optionally required by GBM, EGL and Vulkan
+## Optionally required by EGL
 if HAVE_PLATFORM_WAYLAND
 SUBDIRS += egl/wayland/wayland-drm
 endif
@@ -72,6 +66,7 @@ endif
 if HAVE_VULKAN_COMMON
 SUBDIRS += vulkan
 endif
+
 EXTRA_DIST += vulkan/registry/vk.xml
 
 if HAVE_AMD_DRIVERS
@@ -82,10 +77,14 @@ if HAVE_INTEL_DRIVERS
 SUBDIRS += intel
 endif
 
-if HAVE_GALLIUM_VC4
+if HAVE_BROADCOM_DRIVERS
 SUBDIRS += broadcom
 endif
 
+if HAVE_FREEDRENO_DRIVERS
+SUBDIRS += freedreno
+endif
+
 if NEED_OPENGL_COMMON
 SUBDIRS += mesa
 endif
@@ -101,11 +100,6 @@ if HAVE_GBM
 SUBDIRS += gbm
 endif
 
-## Optionally required by EGL
-if HAVE_PLATFORM_WAYLAND
-SUBDIRS += egl/wayland/wayland-egl
-endif
-
 if HAVE_EGL
 SUBDIRS += egl
 endif
@@ -142,3 +136,18 @@ libglsl_util_la_SOURCES = \
        mesa/program/prog_parameter.c \
        mesa/program/symbol_table.c \
        mesa/program/dummy_errors.c
+
+EXTRA_DIST += \
+       tools/imgui/imconfig.h \
+       tools/imgui/imgui.cpp \
+       tools/imgui/imgui.h \
+       tools/imgui/imgui_draw.cpp \
+       tools/imgui/imgui_demo.cpp \
+       tools/imgui/imgui_internal.h \
+       tools/imgui/imgui_memory_editor.h \
+       tools/imgui/stb_rect_pack.h \
+       tools/imgui/stb_textedit.h \
+       tools/imgui/stb_truetype.h \
+       tools/imgui/README \
+       tools/imgui/LICENSE.txt \
+       tools/imgui/meson.build