X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2FMakefile.am;h=6d7a3cc9486e1e6a67a58d56bfda6010ca9d8f6f;hb=34f741b0809a0d7bb5dbc262bbc3ff2eb743090f;hp=20814c088eb5aadacd9dcd2e429a4cc6efa4d84b;hpb=02f52e8df58aad16e6b59fe35ac0c10b46dad36e;p=mesa.git

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 20814c088eb..6d7a3cc9486 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -19,138 +19,170 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-SUBDIRS = x86 x86-64 . libdricore drivers
+SUBDIRS = . main/tests
+
+if HAVE_XLIB_GLX
+SUBDIRS += drivers/x11
+endif
+
+if HAVE_DRICOMMON
+SUBDIRS += drivers/dri
+endif
+
+if HAVE_OSMESA
+SUBDIRS += drivers/osmesa
+endif
 
 gldir = $(includedir)/GL
 gl_HEADERS = $(top_srcdir)/include/GL/*.h
 
-.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 ;\
-	fi
-
-# include glapi_gen.mk for generating glapi headers for GLES
-GLAPI = $(top_srcdir)/src/mapi/glapi/gen
-include $(GLAPI)/glapi_gen.mk
+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/api_exec_es1_dispatch.h \
-	main/api_exec_es1_remap_helper.h \
-	main/api_exec_es2_dispatch.h \
-	main/api_exec_es2_remap_helper.h \
-	main/api_exec_es1.c \
-	main/api_exec_es2.c \
+	main/get_hash.h \
+	main/format_info.h \
+	main/format_pack.c \
+	main/format_unpack.c \
 	program/program_parse.tab.c \
-	program/program_parse.tab.h \
 	program/lex.yy.c
 CLEANFILES = \
 	$(BUILT_SOURCES) \
-	git_sha1.h.tmp
-
-main/api_exec_es1_dispatch.h: $(GLAPI)/gl_and_es_API.xml $(glapi_gen_dispatch_deps)
-	$(call glapi_gen_dispatch,$<,es1)
+	program/program_parse.tab.h
 
-main/api_exec_es1_remap_helper.h: $(GLAPI)/gl_and_es_API.xml $(glapi_gen_remap_deps)
-	$(call glapi_gen_remap,$<,es1)
+PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
 
-main/api_exec_es1.o: main/api_exec_es1_dispatch.h main/api_exec_es1_remap_helper.h
+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 > $@
 
-main/api_exec_es2_dispatch.h: $(GLAPI)/gl_and_es_API.xml $(glapi_gen_dispatch_deps)
-	$(call glapi_gen_dispatch,$<,es2)
+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/api_exec_es2_remap_helper.h: $(GLAPI)/gl_and_es_API.xml $(glapi_gen_remap_deps)
-	$(call glapi_gen_remap,$<,es2)
+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 > $@
 
-main/api_exec_es2.o: main/api_exec_es2_dispatch.h main/api_exec_es2_remap_helper.h
+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/api_exec_es1.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py
-	$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/main/es_generator.py \
-	  -S $(srcdir)/main/APIspec.xml -V GLES1.1 > $@
+main/formats.c: main/format_info.h
 
-main/api_exec_es2.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py
-	$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/main/es_generator.py \
-	  -S $(srcdir)/main/APIspec.xml -V GLES2.0 > $@
-
-program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y
-	mkdir -p program
-	$(AM_V_GEN) $(YACC) -v -d --output=program/program_parse.tab.c $<
-
-program/lex.yy.c: program/program_lexer.l
-	mkdir -p program
-	$(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $<
+noinst_LTLIBRARIES = $(ARCH_LIBS)
+if NEED_LIBMESA
+noinst_LTLIBRARIES += libmesa.la
+else
+check_LTLIBRARIES = libmesa.la
+endif
+if HAVE_GALLIUM
+noinst_LTLIBRARIES += libmesagallium.la
+endif
 
-noinst_LTLIBRARIES = libmesa.la libmesagallium.la
+AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS)
+AM_CFLAGS = \
+	$(LLVM_CFLAGS) \
+	$(VISIBILITY_CFLAGS) \
+	$(MSVC2013_COMPAT_CFLAGS)
+AM_CXXFLAGS = \
+	$(LLVM_CFLAGS) \
+	$(VISIBILITY_CXXFLAGS) \
+	$(MSVC2013_COMPAT_CXXFLAGS)
 
-SRCDIR = $(top_srcdir)/src/mesa/
-BUILDDIR = $(top_builddir)/src/mesa/
-include sources.mak
+ARCH_LIBS =
 
-AM_CPPFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS)
-AM_CFLAGS = $(LLVM_CFLAGS)
-AM_CXXFLAGS = $(LLVM_CFLAGS)
+if SSE41_SUPPORTED
+ARCH_LIBS += libmesa_sse41.la
+endif
 
-# cannot just add $(MESA_ASM_FILES) to libmesa_la_SOURCES as it contains a configure substitution
 MESA_ASM_FILES_FOR_ARCH =
 
 if HAVE_X86_ASM
-MESA_ASM_FILES_FOR_ARCH += $(X86_FILES)
-AM_CPPFLAGS += \
-        -I$(top_builddir)/src/mesa/x86 \
-        -I$(top_srcdir)/src/mesa/x86
-endif
+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$(top_builddir)/src/mesa/x86-64 \
-        -I$(top_srcdir)/src/mesa/x86-64
+AM_CPPFLAGS += -I$(builddir)/x86-64 -I$(srcdir)/x86-64
+else
+MESA_ASM_FILES_FOR_ARCH += $(X86_FILES)
+AM_CPPFLAGS += -I$(builddir)/x86 -I$(srcdir)/x86
+endif
 endif
 if HAVE_SPARC_ASM
 MESA_ASM_FILES_FOR_ARCH += $(SPARC_FILES)
-AM_CPPFLAGS += \
-        -I$(top_builddir)/src/mesa/sparc \
-        -I$(top_srcdir)/src/mesa/sparc
+AM_CPPFLAGS += -I$(builddir)/sparc -I$(srcdir)/sparc
 endif
 
 libmesa_la_SOURCES = \
 	$(MESA_FILES) \
-	$(MESA_CXX_FILES) \
-        $(MESA_ASM_FILES_FOR_ARCH)
+	$(PROGRAM_FILES) \
+	$(PROGRAM_NIR_FILES) \
+	$(MESA_ASM_FILES_FOR_ARCH)
 
-libmesa_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la
-libmesa_la_LDFLAGS =
+libmesa_la_LIBADD = \
+	$(top_builddir)/src/compiler/glsl/libglsl.la \
+	$(ARCH_LIBS)
 
 libmesagallium_la_SOURCES = \
 	$(MESA_GALLIUM_FILES) \
-	$(MESA_GALLIUM_CXX_FILES) \
-        $(MESA_ASM_FILES_FOR_ARCH)
+	$(PROGRAM_FILES) \
+	$(PROGRAM_NIR_FILES) \
+	$(MESA_ASM_FILES_FOR_ARCH)
 
-libmesagallium_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la
-libmesagallium_la_LDFLAGS =
+libmesagallium_la_LIBADD = \
+	$(top_builddir)/src/compiler/glsl/libglsl.la \
+	$(ARCH_LIBS)
 
-# Provide compatibility with scripts for the old Mesa build system for
-# a while by putting a link to the library in the current directory.
-all-local: libmesa.la libmesagallium.la
-	ln -f .libs/libmesa.a .
-	ln -f .libs/libmesagallium.a .
+libmesa_sse41_la_SOURCES = \
+	$(X86_SSE41_FILES)
 
-CLEANFILES += libmesa.a libmesagallium.a
+libmesa_sse41_la_CFLAGS = $(AM_CFLAGS) $(SSE41_CFLAGS)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gl.pc
 
+MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
+YACC_GEN = $(AM_V_GEN)$(YACC) $(YFLAGS)
+LEX_GEN = $(AM_V_GEN)$(LEX) $(LFLAGS)
+
+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:
-	etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h
+	etags `find . -name \*.[ch]` $(top_srcdir)/include/GL/*.h