projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
st/mesa: use PROGRAM_ARRAY for storing structs containing arrays
[mesa.git]
/
src
/
mesa
/
Makefile.am
diff --git
a/src/mesa/Makefile.am
b/src/mesa/Makefile.am
index ac142fd33b998d11dd736887cc0ad8de3bff7511..eb4a3da3c840993a9214f779dff145f24780e075 100644
(file)
--- a/
src/mesa/Makefile.am
+++ b/
src/mesa/Makefile.am
@@
-36,10
+36,13
@@
endif
gldir = $(includedir)/GL
gl_HEADERS = $(top_srcdir)/include/GL/*.h
gldir = $(includedir)/GL
gl_HEADERS = $(top_srcdir)/include/GL/*.h
-.PHONY: $(BUILDDIR)main/git_sha1.h.tmp
-$(BUILDDIR)main/git_sha1.h.tmp:
+.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
@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"/' \
if which git > /dev/null; then \
git --git-dir=$(top_srcdir)/.git log -n 1 --oneline | \
sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \
@@
-47,7
+50,7
@@
$(BUILDDIR)main/git_sha1.h.tmp:
fi \
fi
fi \
fi
-
$(BUILDDIR)main/git_sha1.h: $(BUILDDIR)
main/git_sha1.h.tmp
+
main/git_sha1.h:
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 ;\
@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 ;\
@@
-55,17
+58,10
@@
$(BUILDDIR)main/git_sha1.h: $(BUILDDIR)main/git_sha1.h.tmp
rm main/git_sha1.h.tmp ;\
fi
rm main/git_sha1.h.tmp ;\
fi
-# include glapi_gen.mk for generating glapi headers for GLES
-GLAPI = $(top_srcdir)/src/mapi/glapi/gen
-include $(GLAPI)/glapi_gen.mk
-
-BUILDDIR = $(builddir)/
include Makefile.sources
EXTRA_DIST = \
include Makefile.sources
EXTRA_DIST = \
- drivers/haiku \
drivers/SConscript \
drivers/SConscript \
- drivers/windows \
main/format_info.py \
main/format_pack.py \
main/format_parser.py \
main/format_info.py \
main/format_pack.py \
main/format_parser.py \
@@
-83,27
+79,27
@@
EXTRA_DIST = \
BUILT_SOURCES = \
main/get_hash.h \
BUILT_SOURCES = \
main/get_hash.h \
-
main/format_info.c
\
-
$(BUILDDIR)
main/git_sha1.h \
+
main/format_info.h
\
+ main/git_sha1.h \
main/format_pack.c \
main/format_unpack.c \
main/format_pack.c \
main/format_unpack.c \
-
$(BUILDDIR)
program/program_parse.tab.c \
-
$(BUILDDIR)
program/lex.yy.c
+ program/program_parse.tab.c \
+ program/lex.yy.c
CLEANFILES = \
$(BUILT_SOURCES) \
CLEANFILES = \
$(BUILT_SOURCES) \
-
$(BUILDDIR)
program/program_parse.tab.h \
-
$(BUILDDIR)
main/git_sha1.h.tmp
+ program/program_parse.tab.h \
+ main/git_sha1.h.tmp
GET_HASH_GEN = main/get_hash_generator.py
GET_HASH_GEN = main/get_hash_generator.py
-main/get_hash.h:
$(GLAPI)/gl_and_es_API.xml main/get_hash_params.py
\
- $(GET_HASH_GEN)
Makefile
+main/get_hash.h:
../mapi/glapi/gen/gl_and_es_API.xml main/get_hash_params.py
\
+ $(GET_HASH_GEN)
$(AM_V_GEN)set -e; \
$(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/$(GET_HASH_GEN) \
-f $< > $@.tmp; \
mv $@.tmp $@;
$(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 \
main/format_parser.py main/format_info.py
$(AM_V_GEN)set -e; \
$(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/main/format_info.py \
@@
-126,7
+122,7
@@
main/format_unpack.c: main/format_unpack.py main/formats.csv \
$(srcdir)/main/formats.csv \
| $(INDENT) $(INDENT_FLAGS) > $@;
$(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
noinst_LTLIBRARIES = $(ARCH_LIBS)
if NEED_LIBMESA
@@
-139,8
+135,14
@@
noinst_LTLIBRARIES += libmesagallium.la
endif
AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS)
endif
AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS)
-AM_CFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CFLAGS)
-AM_CXXFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CXXFLAGS)
+AM_CFLAGS = \
+ $(LLVM_CFLAGS) \
+ $(VISIBILITY_CFLAGS) \
+ $(MSVC2013_COMPAT_CFLAGS)
+AM_CXXFLAGS = \
+ $(LLVM_CFLAGS) \
+ $(VISIBILITY_CXXFLAGS) \
+ $(MSVC2013_COMPAT_CXXFLAGS)
ARCH_LIBS =
ARCH_LIBS =
@@
-172,6
+174,7
@@
endif
libmesa_la_SOURCES = \
$(MESA_FILES) \
$(PROGRAM_FILES) \
libmesa_la_SOURCES = \
$(MESA_FILES) \
$(PROGRAM_FILES) \
+ $(PROGRAM_NIR_FILES) \
$(MESA_ASM_FILES_FOR_ARCH)
libmesa_la_LIBADD = \
$(MESA_ASM_FILES_FOR_ARCH)
libmesa_la_LIBADD = \
@@
-181,6
+184,7
@@
libmesa_la_LIBADD = \
libmesagallium_la_SOURCES = \
$(MESA_GALLIUM_FILES) \
$(PROGRAM_FILES) \
libmesagallium_la_SOURCES = \
$(MESA_GALLIUM_FILES) \
$(PROGRAM_FILES) \
+ $(PROGRAM_NIR_FILES) \
$(MESA_ASM_FILES_FOR_ARCH)
libmesagallium_la_LIBADD = \
$(MESA_ASM_FILES_FOR_ARCH)
libmesagallium_la_LIBADD = \
@@
-197,13
+201,13
@@
libmesa_sse41_la_CFLAGS = $(AM_CFLAGS) $(SSE41_CFLAGS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gl.pc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gl.pc
-
$(BUILDDIR)
program/lex.yy.c: program/program_lexer.l
+program/lex.yy.c: program/program_lexer.l
$(AM_V_at)$(MKDIR_P) program
$(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $<
$(AM_V_at)$(MKDIR_P) program
$(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $<
-
$(BUILDDIR)program/program_parse.tab.c $(BUILDDIR)
program/program_parse.tab.h: program/program_parse.y
+
program/program_parse.tab.c
program/program_parse.tab.h: program/program_parse.y
$(AM_V_at)$(MKDIR_P) program
$(AM_V_at)$(MKDIR_P) program
- $(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=
$(BUILDDIR)
program/program_parse.tab.c $<
+ $(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=program/program_parse.tab.c $<
if GEN_ASM_OFFSETS
matypes.h: $(gen_matypes_SOURCES)
if GEN_ASM_OFFSETS
matypes.h: $(gen_matypes_SOURCES)