X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2FMakefile.am;h=037384ad662f290355674cdb640b39e52e39f207;hb=239ff641739dc9d6ce210ad3abb37b7e01171375;hp=5f9bae2ac2af19769ca36eeeb498404cc68fb38b;hpb=d8abd6710ea41545ae2fb9b8e718d29a69574b1a;p=mesa.git diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 5f9bae2ac2a..037384ad662 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -19,13 +19,13 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -SUBDIRS = x86 x86-64 . main/tests +SUBDIRS = . main/tests -if HAVE_X11_DRIVER +if HAVE_XLIB_GLX SUBDIRS += drivers/x11 endif -if HAVE_DRI +if HAVE_DRICOMMON SUBDIRS += drivers/dri endif @@ -33,55 +33,63 @@ if HAVE_OSMESA SUBDIRS += drivers/osmesa endif +if HAVE_GLX gldir = $(includedir)/GL gl_HEADERS = $(top_srcdir)/include/GL/*.h +endif -.PHONY: main/git_sha1.h.tmp -main/git_sha1.h.tmp: - @touch main/git_sha1.h.tmp - @if test -d ../../.git; then \ - if which git > /dev/null; then \ - 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 - @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 ;\ - else \ - 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 = \ + drivers/SConscript \ + main/format_info.py \ + main/format_pack.py \ + main/format_parser.py \ + main/format_unpack.py \ + main/formats.csv \ + main/get_hash_generator.py \ + main/get_hash_params.py \ + program/program_lexer.l \ + program/program_parse.y \ + SConscript \ + swrast/NOTES \ + swrast_setup/NOTES \ + tnl/NOTES \ + tnl_dd + BUILT_SOURCES = \ - main/git_sha1.h \ main/get_hash.h \ - $(BUILDDIR)program/program_parse.tab.c \ - $(BUILDDIR)program/lex.yy.c + main/format_info.h \ + main/format_pack.c \ + main/format_unpack.c \ + program/program_parse.tab.c \ + program/lex.yy.c CLEANFILES = \ $(BUILT_SOURCES) \ - $(BUILDDIR)program/program_parse.tab.h \ - git_sha1.h.tmp + program/program_parse.tab.h + +PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) + +main/get_hash.h: ../mapi/glapi/gen/gl_and_es_API.xml main/get_hash_params.py \ + main/get_hash_generator.py + $(PYTHON_GEN) $(srcdir)/main/get_hash_generator.py \ + -f $(srcdir)/../mapi/glapi/gen/gl_and_es_API.xml > $@ -GET_HASH_GEN = main/get_hash_generator.py +main/format_info.h: main/formats.csv \ + main/format_parser.py main/format_info.py + $(PYTHON_GEN) $(srcdir)/main/format_info.py $(srcdir)/main/formats.csv > $@ -main/get_hash.h: $(GLAPI)/gl_and_es_API.xml main/get_hash_params.py \ - $(GET_HASH_GEN) Makefile - $(AM_V_GEN)set -e; \ - $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/$(GET_HASH_GEN) \ - -f $< > $@.tmp; \ - mv $@.tmp $@; +main/format_pack.c: main/format_pack.py main/formats.csv \ + main/format_parser.py + $(PYTHON_GEN) $(srcdir)/main/format_pack.py $(srcdir)/main/formats.csv > $@ -noinst_LTLIBRARIES = +main/format_unpack.c: main/format_unpack.py main/formats.csv \ + main/format_parser.py + $(PYTHON_GEN) $(srcdir)/main/format_unpack.py $(srcdir)/main/formats.csv > $@ + +main/formats.c: main/format_info.h + +noinst_LTLIBRARIES = $(ARCH_LIBS) if NEED_LIBMESA noinst_LTLIBRARIES += libmesa.la else @@ -92,12 +100,29 @@ noinst_LTLIBRARIES += libmesagallium.la 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 = + +if SSE41_SUPPORTED +ARCH_LIBS += libmesa_sse41.la +endif MESA_ASM_FILES_FOR_ARCH = if HAVE_X86_ASM +noinst_PROGRAMS = gen_matypes + +gen_matypes_SOURCES = x86/gen_matypes.c +BUILT_SOURCES += matypes.h + if HAVE_X86_64_ASM MESA_ASM_FILES_FOR_ARCH += $(X86_64_FILES) AM_CPPFLAGS += -I$(builddir)/x86-64 -I$(srcdir)/x86-64 @@ -114,31 +139,53 @@ endif libmesa_la_SOURCES = \ $(MESA_FILES) \ $(PROGRAM_FILES) \ - $(MESA_ASM_FILES_FOR_ARCH) + $(PROGRAM_NIR_FILES) \ + $(MESA_ASM_FILES_FOR_ARCH) libmesa_la_LIBADD = \ - $(top_builddir)/src/glsl/libglsl.la \ - $() + $(top_builddir)/src/compiler/glsl/libglsl.la \ + $(ARCH_LIBS) libmesagallium_la_SOURCES = \ $(MESA_GALLIUM_FILES) \ $(PROGRAM_FILES) \ - $(MESA_ASM_FILES_FOR_ARCH) + $(PROGRAM_NIR_FILES) \ + $(MESA_ASM_FILES_FOR_ARCH) libmesagallium_la_LIBADD = \ - $(top_builddir)/src/glsl/libglsl.la \ - $() + $(top_builddir)/src/compiler/glsl/libglsl.la \ + $(ARCH_LIBS) + +libmesa_sse41_la_SOURCES = \ + $(X86_SSE41_FILES) +libmesa_sse41_la_CFLAGS = $(AM_CFLAGS) $(SSE41_CFLAGS) + +if HAVE_GLX pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gl.pc +endif -$(BUILDDIR)program/lex.yy.c: program/program_lexer.l - $(MKDIR_P) $(builddir)/program - $(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $< +MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) +YACC_GEN = $(AM_V_GEN)$(YACC) $(YFLAGS) +LEX_GEN = $(AM_V_GEN)$(LEX) $(LFLAGS) -$(BUILDDIR)program/program_parse.tab.c $(BUILDDIR)program/program_parse.tab.h: program/program_parse.y - $(MKDIR_P) $(builddir)/program - $(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=$(BUILDDIR)program/program_parse.tab.c $< +program/lex.yy.c: program/program_lexer.l + $(MKDIR_GEN) + $(LEX_GEN) -o $@ $(srcdir)/program/program_lexer.l + +program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y + $(MKDIR_GEN) + $(YACC_GEN) -o $@ -p "_mesa_program_" --defines=$(builddir)/program/program_parse.tab.h $(srcdir)/program/program_parse.y + +if GEN_ASM_OFFSETS +matypes.h: $(gen_matypes_SOURCES) + $(AM_V_GEN)$(COMPILE) $< -DASM_OFFSETS -S -o - | \ + sed -n '/^->/{s:^->::;/[$$]/{s:^:#define :;s:[$$]::};p}' > $@ +else +matypes.h: gen_matypes + $(AM_V_GEN)./gen_matypes > $@ +endif # Emacs tags tags: