gallium: add PIPE_CAP_TGSI_TEX_TXF_LZ

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

diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index 160a255af6a265967883accd314bb8f373df04a2..7ebe14f520758c2bb1d53ba853c150e47f21be2e 100644 (file)
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -35,6 +35,7 @@ EXTRA_DIST = \
        es2api/ABI-check \
        mapi_abi.py \
        glapi/SConscript \
+       glapi/registry/gl.xml \
        shared-glapi/SConscript
 
 AM_CFLAGS = \
@@ -45,29 +46,27 @@ AM_CPPFLAGS =                                                       \
        $(SELINUX_CFLAGS)                                       \
        -I$(top_srcdir)/include                                 \
        -I$(top_srcdir)/src                                     \
-       -I$(top_srcdir)/src/mapi                                \
-       -I$(top_builddir)/src/mapi
+       -I$(top_builddir)/src/mapi                              \
+       -I$(top_srcdir)/src/mapi
 
 include Makefile.sources
 
+MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
+PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
+
 glapi_gen_mapi_deps := \
        mapi_abi.py \
-       $(wildcard glapi/gen/*.xml) \
-       $(wildcard glapi/gen/*.py)
-
-# $(1): path to an XML file
-# $(2): name of the printer
-define glapi_gen_mapi
-@$(MKDIR_P) $(dir $@)
-$(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/mapi_abi.py \
-       --mode lib --printer $(2) $(1) > $@
-endef
+       $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.xml) \
+       $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.py)
 
 if HAVE_SHARED_GLAPI
 BUILT_SOURCES += shared-glapi/glapi_mapi_tmp.h
 
 lib_LTLIBRARIES += shared-glapi/libglapi.la
 shared_glapi_libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) shared-glapi/glapi_mapi_tmp.h
+shared_glapi_libglapi_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(VISIBILITY_CFLAGS)
 shared_glapi_libglapi_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -DMAPI_MODE_GLAPI \
@@ -93,7 +92,9 @@ shared_glapi_test_LDADD = \
 endif
 
 shared-glapi/glapi_mapi_tmp.h : glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
-       $(call glapi_gen_mapi,$<,shared-glapi)
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) $(srcdir)/mapi_abi.py --mode lib --printer shared-glapi \
+               $(srcdir)/glapi/gen/gl_and_es_API.xml > $@
 
 if HAVE_OPENGL
 noinst_LTLIBRARIES = glapi/libglapi.la
@@ -109,12 +110,19 @@ if HAVE_SPARC_ASM
 GLAPI_ASM_SOURCES = glapi/glapi_sparc.S
 endif
 
-glapi_libglapi_la_SOURCES = glapi/glapi_gentable.c
+glapi_libglapi_la_SOURCES =
 glapi_libglapi_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -I$(top_srcdir)/src/mapi/glapi \
        -I$(top_srcdir)/src/mesa
 
+if HAVE_APPLEDRI
+glapi_libglapi_la_SOURCES += glapi/glapi_gentable.c
+endif
+if HAVE_WINDOWSDRI
+glapi_libglapi_la_SOURCES += glapi/glapi_gentable.c
+endif
+
 if HAVE_SHARED_GLAPI
 glapi_libglapi_la_SOURCES += $(MAPI_BRIDGE_FILES) glapi/glapi_mapi_tmp.h
 glapi_libglapi_la_CPPFLAGS += \
@@ -185,7 +193,9 @@ endif
 endif
 
 es1api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
-       $(call glapi_gen_mapi,$<,es1api)
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) $(srcdir)/mapi_abi.py --mode lib --printer es1api \
+               $(srcdir)/glapi/gen/gl_and_es_API.xml > $@
 
 if HAVE_OPENGL_ES2
 TESTS += es2api/ABI-check
@@ -203,6 +213,7 @@ GLES3_includedir = $(includedir)/GLES3
 GLES3_include_HEADERS = \
        $(top_srcdir)/include/GLES3/gl3.h \
        $(top_srcdir)/include/GLES3/gl31.h \
+       $(top_srcdir)/include/GLES3/gl32.h \
        $(top_srcdir)/include/GLES3/gl3ext.h \
        $(top_srcdir)/include/GLES3/gl3platform.h
 
@@ -229,6 +240,8 @@ endif
 endif
 
 es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
-       $(call glapi_gen_mapi,$<,es2api)
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) $(srcdir)/mapi_abi.py --mode lib --printer es2api \
+               $(srcdir)/glapi/gen/gl_and_es_API.xml > $@
 
 include $(top_srcdir)/install-lib-links.mk