build: Fix out-of-tree generation of api_exec_es{1,2}.c

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

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 5736c5d574539edbd17aa5a4c0613e08300f504a..1049ad49d80ea682c0d8740536f2a8fbb20e2cee 100644 (file)
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -42,8 +42,7 @@ main/git_sha1.h: main/git_sha1.h.tmp
        fi
 
 # include glapi_gen.mk for generating glapi headers for GLES
-TOP = $(top_srcdir)
-GLAPI = $(TOP)/src/mapi/glapi/gen
+GLAPI = $(top_srcdir)/src/mapi/glapi/gen
 include $(GLAPI)/glapi_gen.mk
 
 BUILT_SOURCES = \
@@ -78,11 +77,11 @@ main/api_exec_es2_remap_helper.h: $(GLAPI)/gl_and_es_API.xml $(glapi_gen_remap_d
 main/api_exec_es2.o: main/api_exec_es2_dispatch.h main/api_exec_es2_remap_helper.h
 
 main/api_exec_es1.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py
-       $(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py \
+       $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/main/es_generator.py \
          -S $(srcdir)/main/APIspec.xml -V GLES1.1 > $@
 
 main/api_exec_es2.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py
-       $(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py \
+       $(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
@@ -93,19 +92,65 @@ program/lex.yy.c: program/program_lexer.l
        mkdir -p program
        $(LEX) --never-interactive --outfile=$@ $<
 
-all-local:
-       $(MAKE) -f Makefile.old
+noinst_LTLIBRARIES = libmesa.la libmesagallium.la
 
-install-exec-local:
-       $(MAKE) -f Makefile.old install
+SRCDIR = $(top_srcdir)/src/mesa/
+BUILDDIR = $(top_builddir)/src/mesa/
+include sources.mak
 
-clean-local:
-       $(MAKE) -f Makefile.old clean
+AM_CPPFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS)
+AM_CFLAGS = $(LLVM_CFLAGS)
+AM_CXXFLAGS = $(LLVM_CFLAGS)
 
-pkgconfigdir = $(libdir)/pkgconfig
+# cannot just add $(MESA_ASM_FILES) to libmesa_la_SOURCES as it contains a configure substitution
+MESA_ASM_FILES_FOR_ARCH =
 
-if HAVE_OSMESA_DRIVER
-pkgconfig_DATA = osmesa.pc
-else
-pkgconfig_DATA = gl.pc
+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
+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
+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
 endif
+
+libmesa_la_SOURCES = \
+       $(MESA_FILES) \
+       $(MESA_CXX_FILES) \
+        $(MESA_ASM_FILES_FOR_ARCH)
+
+libmesa_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la
+libmesa_la_LDFLAGS =
+
+libmesagallium_la_SOURCES = \
+       $(MESA_GALLIUM_FILES) \
+       $(MESA_GALLIUM_CXX_FILES) \
+        $(MESA_ASM_FILES_FOR_ARCH)
+
+libmesagallium_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la
+libmesagallium_la_LDFLAGS =
+
+# 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 .
+
+CLEANFILES += libmesa.a libmesagallium.a
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gl.pc
+
+# Emacs tags
+tags:
+       etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h