mesa: Add ARB_shader_image_load_store to the extension table.

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

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 4387415facf7ec6fcf54d21189853abbf3446d48..cb038a5ebc9ac75809059a79d039e0b52fa01302 100644 (file)
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -36,18 +36,18 @@ endif
 gldir = $(includedir)/GL
 gl_HEADERS = $(top_srcdir)/include/GL/*.h
 
-.PHONY: main/git_sha1.h.tmp
-main/git_sha1.h.tmp:
+.PHONY: $(BUILDDIR)main/git_sha1.h.tmp
+$(BUILDDIR)main/git_sha1.h.tmp:
        @touch main/git_sha1.h.tmp
-       @if test -d ../../.git; then \
+       @if test -d $(top_srcdir)/.git; then \
                if which git > /dev/null; then \
-                   git log -n 1 --oneline | \
+                   git --git-dir=$(top_srcdir)/.git log -n 1 --oneline | \
                        sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \
                        > main/git_sha1.h.tmp ; \
                fi \
        fi
 
-main/git_sha1.h: main/git_sha1.h.tmp
+$(BUILDDIR)main/git_sha1.h: $(BUILDDIR)main/git_sha1.h.tmp
        @echo "updating main/git_sha1.h"
        @if ! cmp -s main/git_sha1.h.tmp main/git_sha1.h; then \
                mv main/git_sha1.h.tmp main/git_sha1.h ;\
@@ -63,8 +63,8 @@ BUILDDIR = $(builddir)/
 include Makefile.sources
 
 BUILT_SOURCES = \
-       main/git_sha1.h \
        main/get_hash.h \
+       $(BUILDDIR)main/git_sha1.h \
        $(BUILDDIR)program/program_parse.tab.c \
        $(BUILDDIR)program/lex.yy.c
 CLEANFILES = \
@@ -81,7 +81,7 @@ main/get_hash.h: $(GLAPI)/gl_and_es_API.xml main/get_hash_params.py   \
                -f $< > $@.tmp;                                         \
        mv $@.tmp $@;
 
-noinst_LTLIBRARIES =
+noinst_LTLIBRARIES = $(ARCH_LIBS)
 if NEED_LIBMESA
 noinst_LTLIBRARIES += libmesa.la
 else
@@ -103,6 +103,12 @@ noinst_PROGRAMS = gen_matypes
 gen_matypes_SOURCES = x86/gen_matypes.c
 BUILT_SOURCES += matypes.h
 
+ARCH_LIBS =
+
+if SSE41_SUPPORTED
+ARCH_LIBS += libmesa_sse41.la
+endif
+
 if HAVE_X86_64_ASM
 MESA_ASM_FILES_FOR_ARCH += $(X86_64_FILES)
 AM_CPPFLAGS += -I$(builddir)/x86-64 -I$(srcdir)/x86-64
@@ -123,6 +129,7 @@ libmesa_la_SOURCES = \
 
 libmesa_la_LIBADD = \
         $(top_builddir)/src/glsl/libglsl.la \
+       $(ARCH_LIBS) \
         $()
 
 libmesagallium_la_SOURCES = \
@@ -132,8 +139,13 @@ libmesagallium_la_SOURCES = \
 
 libmesagallium_la_LIBADD = \
         $(top_builddir)/src/glsl/libglsl.la \
+       $(ARCH_LIBS) \
         $()
 
+libmesa_sse41_la_SOURCES = \
+       main/streaming-load-memcpy.c
+libmesa_sse41_la_CFLAGS = $(AM_CFLAGS) -msse4.1
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gl.pc