automake,android: Build program/ into a helper lib (v2)

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

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 6964c8a68ab7558d8a5b43a8886a2e86ac03a40c..9809ee437cc93eee1afcbd82fd5616328ea8bb7f 100644 (file)
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -19,7 +19,11 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-SUBDIRS = x86 x86-64 . libdricore drivers
+if NEED_LIBDRICORE
+DRICORE_SUBDIR = libdricore
+endif
+
+SUBDIRS = program x86 x86-64 . $(DRICORE_SUBDIR) drivers
 
 gldir = $(includedir)/GL
 gl_HEADERS = $(top_srcdir)/include/GL/*.h
@@ -49,50 +53,21 @@ include $(GLAPI)/glapi_gen.mk
 
 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 \
-       program/program_parse.tab.c \
-       program/program_parse.tab.h \
-       program/lex.yy.c
+       main/get_hash.h
 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)
-
-main/api_exec_es1_remap_helper.h: $(GLAPI)/gl_and_es_API.xml $(glapi_gen_remap_deps)
-       $(call glapi_gen_remap,$<,es1)
-
-main/api_exec_es1.o: main/api_exec_es1_dispatch.h main/api_exec_es1_remap_helper.h
-
-main/api_exec_es2_dispatch.h: $(GLAPI)/gl_and_es_API.xml $(glapi_gen_dispatch_deps)
-       $(call glapi_gen_dispatch,$<,es2)
-
-main/api_exec_es2_remap_helper.h: $(GLAPI)/gl_and_es_API.xml $(glapi_gen_remap_deps)
-       $(call glapi_gen_remap,$<,es2)
+GET_HASH_GEN = main/get_hash_generator.py
+GET_HASH_GEN_FLAGS := $(patsubst -DFEATURE_%=1,-a %, \
+                       $(patsubst -DFEATURE_%=0,,$(API_DEFINES)))
 
-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
-       $(AM_V_GEN) $(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
-       $(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=$@ $<
+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)            \
+               $(GET_HASH_GEN_FLAGS) -f $< > $@.tmp;                   \
+       mv $@.tmp $@;
 
 noinst_LTLIBRARIES =
 if NEED_LIBMESA
@@ -109,8 +84,8 @@ BUILDDIR = $(top_builddir)/src/mesa/
 include sources.mak
 
 AM_CPPFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS)
-AM_CFLAGS = $(LLVM_CFLAGS)
-AM_CXXFLAGS = $(LLVM_CFLAGS)
+AM_CFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CFLAGS)
+AM_CXXFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CXXFLAGS)
 
 # cannot just add $(MESA_ASM_FILES) to libmesa_la_SOURCES as it contains a configure substitution
 MESA_ASM_FILES_FOR_ARCH =
@@ -136,18 +111,23 @@ 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_LIBADD = \
+        $(top_builddir)/src/glsl/libglsl.la \
+        $(top_builddir)/src/mesa/program/libprogram.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_LIBADD = \
+        $(top_builddir)/src/glsl/libglsl.la \
+        $(top_builddir)/src/mesa/program/libprogram.la \
+        $()
+
 libmesagallium_la_LDFLAGS =
 
 if HAVE_GALLIUM