gallium: add flags parameter to pipe_screen::context_create

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

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 5e9a82098fb07cd41707f86d01e1d86ed3606957..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,9 +61,7 @@ main/git_sha1.h: main/git_sha1.h.tmp
 include Makefile.sources
 
 EXTRA_DIST = \
-       drivers/haiku \
        drivers/SConscript \
-       drivers/windows \
        main/format_info.py \
        main/format_pack.py \
        main/format_parser.py \
@@ -80,7 +79,7 @@ EXTRA_DIST = \
 
 BUILT_SOURCES = \
        main/get_hash.h \
-        main/format_info.c \
+       main/format_info.h \
        main/git_sha1.h \
        main/format_pack.c \
        main/format_unpack.c \
@@ -94,13 +93,13 @@ CLEANFILES = \
 GET_HASH_GEN = main/get_hash_generator.py
 
 main/get_hash.h: ../mapi/glapi/gen/gl_and_es_API.xml main/get_hash_params.py   \
-                $(GET_HASH_GEN) Makefile
+                $(GET_HASH_GEN)
        $(AM_V_GEN)set -e;                                              \
        $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/$(GET_HASH_GEN)            \
                -f $< > $@.tmp;                                         \
        mv $@.tmp $@;
 
-main/format_info.c: main/formats.csv                                    \
+main/format_info.h: main/formats.csv                                    \
                     main/format_parser.py main/format_info.py
        $(AM_V_GEN)set -e;                                              \
        $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/main/format_info.py        \
@@ -123,7 +122,7 @@ main/format_unpack.c: main/format_unpack.py main/formats.csv        \
                        $(srcdir)/main/formats.csv                      \
                | $(INDENT) $(INDENT_FLAGS) > $@;
 
-main/formats.c: main/format_info.c
+main/formats.c: main/format_info.h
 
 noinst_LTLIBRARIES = $(ARCH_LIBS)
 if NEED_LIBMESA
@@ -175,6 +174,7 @@ endif
 libmesa_la_SOURCES = \
        $(MESA_FILES) \
        $(PROGRAM_FILES) \
+       $(PROGRAM_NIR_FILES) \
        $(MESA_ASM_FILES_FOR_ARCH)
 
 libmesa_la_LIBADD = \
@@ -184,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 = \