i965/fs: Clamp image array indices to the array bounds on IVB.

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

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 3dab8f03f98834a1a6aca29caf27093b5a540e9f..eb4a3da3c840993a9214f779dff145f24780e075 100644 (file)
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -19,8 +19,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 SUBDIRS = . main/tests
 
 if HAVE_X11_DRIVER
@@ -40,8 +38,11 @@ gl_HEADERS = $(top_srcdir)/include/GL/*.h
 
 .PHONY: main/git_sha1.h.tmp
 main/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.
        @touch main/git_sha1.h.tmp
-       @if test -d $(top_srcdir)/.git; then \
+       @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"/' \
@@ -60,7 +61,6 @@ main/git_sha1.h: main/git_sha1.h.tmp
 include Makefile.sources
 
 EXTRA_DIST = \
-       drivers/haiku \
        drivers/SConscript \
        main/format_info.py \
        main/format_pack.py \
@@ -174,6 +174,7 @@ endif
 libmesa_la_SOURCES = \
        $(MESA_FILES) \
        $(PROGRAM_FILES) \
+       $(PROGRAM_NIR_FILES) \
        $(MESA_ASM_FILES_FOR_ARCH)
 
 libmesa_la_LIBADD = \
@@ -183,6 +184,7 @@ libmesa_la_LIBADD = \
 libmesagallium_la_SOURCES = \
        $(MESA_GALLIUM_FILES) \
        $(PROGRAM_FILES) \
+       $(PROGRAM_NIR_FILES) \
        $(MESA_ASM_FILES_FOR_ARCH)
 
 libmesagallium_la_LIBADD = \