configure.ac: split the wayland client/server confusion

[mesa.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index df912c442af14a239e1f7a13b6517d6985f3c1b8..7ca3c0a12d9037c2f52340d184d33fb305c17699 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,18 +21,7 @@
 
 .PHONY: git_sha1.h.tmp
 git_sha1.h.tmp:
-       @# Don't assume that $(top_srcdir)/.git is a directory. It may be
-       @# a gitlink file if $(top_srcdir) is a submodule checkout or a linked
-       @# worktree.
-       @# If we are building from a release tarball copy the bundled header.
-       @touch git_sha1.h.tmp
-       @if test -e $(top_srcdir)/.git; then \
-               if which git > /dev/null; then \
-                       printf '#define MESA_GIT_SHA1 "git-%s"\n' \
-                       `git --git-dir=$(top_srcdir)/.git rev-parse --short=10 HEAD` \
-                       > git_sha1.h.tmp ; \
-               fi \
-       fi
+       @$(PYTHON2) $(top_srcdir)/bin/git_sha1_gen.py > $@
 
 git_sha1.h: git_sha1.h.tmp
        @echo "updating git_sha1.h"
@@ -83,7 +72,9 @@ endif
 if HAVE_VULKAN_COMMON
 SUBDIRS += vulkan
 endif
+
 EXTRA_DIST += vulkan/registry/vk.xml
+EXTRA_DIST += vulkan/registry/vk_android_native_buffer.xml
 
 if HAVE_AMD_DRIVERS
 SUBDIRS += amd
@@ -93,6 +84,10 @@ if HAVE_INTEL_DRIVERS
 SUBDIRS += intel
 endif
 
+if HAVE_GALLIUM_VC4
+SUBDIRS += broadcom
+endif
+
 if NEED_OPENGL_COMMON
 SUBDIRS += mesa
 endif