anv/meta: fix unreachable() typo

[mesa.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 45590c0a07a4ab44c6e539e6aaabac77629b86c5..cffb9e8b0a21bf14c6647120437e12fa36f14786 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,14 +25,13 @@ git_sha1.h.tmp:
        @# 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 \
                    git --git-dir=$(top_srcdir)/.git log -n 1 --oneline | \
                        sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \
                        > git_sha1.h.tmp ; \
                fi \
-       else \
-               cp git_sha1.h git_sha1.h.tmp ;\
        fi
 
 git_sha1.h: git_sha1.h.tmp
@@ -44,6 +43,7 @@ git_sha1.h: git_sha1.h.tmp
        fi
 
 BUILT_SOURCES = git_sha1.h
+CLEANFILES = $(BUILT_SOURCES)
 
 SUBDIRS = . gtest util mapi/glapi/gen mapi
 
@@ -83,6 +83,10 @@ if HAVE_EGL
 SUBDIRS += egl
 endif
 
+if HAVE_INTEL_DRIVERS
+SUBDIRS += intel/tools
+endif
+
 ## Requires the i965 compiler (part of mesa) and wayland-drm
 if HAVE_INTEL_VULKAN
 SUBDIRS += intel/vulkan
@@ -93,7 +97,7 @@ SUBDIRS += gallium
 endif
 
 EXTRA_DIST = \
-       getopt hgl SConscript git_sha1.h
+       getopt hgl SConscript
 
 AM_CFLAGS = $(VISIBILITY_CFLAGS)
 AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
@@ -107,6 +111,7 @@ AM_CPPFLAGS = \
 noinst_LTLIBRARIES = libglsl_util.la
 
 libglsl_util_la_SOURCES = \
+       mesa/main/extensions_table.c \
        mesa/main/imports.c \
        mesa/program/prog_hash_table.c \
        mesa/program/symbol_table.c \