anv/meta: fix unreachable() typo

[mesa.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 9f51e444dd020ff506567a4c473bc9f357ccf256..cffb9e8b0a21bf14c6647120437e12fa36f14786 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,10 +19,43 @@
 # 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:
+       @# 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 \
+                   git --git-dir=$(top_srcdir)/.git log -n 1 --oneline | \
+                       sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \
+                       > git_sha1.h.tmp ; \
+               fi \
+       fi
+
+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
+
+BUILT_SOURCES = git_sha1.h
+CLEANFILES = $(BUILT_SOURCES)
+
 SUBDIRS = . gtest util mapi/glapi/gen mapi
 
+# include only conditionally ?
+SUBDIRS += compiler
+
+if HAVE_INTEL_DRIVERS
+SUBDIRS += intel
+endif
+
 if NEED_OPENGL_COMMON
-SUBDIRS += glsl mesa
+SUBDIRS += mesa
 endif
 
 SUBDIRS += loader
@@ -31,18 +64,34 @@ if HAVE_DRI_GLX
 SUBDIRS += glx
 endif
 
-if HAVE_EGL_PLATFORM_WAYLAND
-SUBDIRS += egl/wayland/wayland-egl egl/wayland/wayland-drm
+## Optionally required by GBM and EGL
+if HAVE_PLATFORM_WAYLAND
+SUBDIRS += egl/wayland/wayland-drm
 endif
 
+## Optionally required by EGL (aka PLATFORM_GBM)
 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
 
+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
+endif
+
 if HAVE_GALLIUM
 SUBDIRS += gallium
 endif
@@ -53,11 +102,6 @@ EXTRA_DIST = \
 AM_CFLAGS = $(VISIBILITY_CFLAGS)
 AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
 
-if HAVE_VULKAN
-SUBDIRS += isl
-SUBDIRS += vulkan
-endif
-
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include/ \
        -I$(top_srcdir)/src/mapi/ \
@@ -67,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 \