mapi/new: import mapi scripts from glvnd

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

diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index 307e05d503f7f1852ed3849dd0f5e075ed15d22b..5a619bf049b2811caf43003beff68b0aefb8c93a 100644 (file)
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -31,11 +31,19 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA =
 
 EXTRA_DIST = \
+       new/genCommon.py \
+       new/gen_gldispatch_mapi.py \
        es1api/ABI-check \
        es2api/ABI-check \
        mapi_abi.py \
        glapi/SConscript \
-       shared-glapi/SConscript
+       glapi/registry/gl.xml \
+       shared-glapi/SConscript \
+       es1api/meson.build \
+       es2api/meson.build \
+       glapi/meson.build \
+       shared-glapi/meson.build \
+       meson.build
 
 AM_CFLAGS = \
        $(PTHREAD_CFLAGS) \
@@ -45,24 +53,29 @@ AM_CPPFLAGS =                                                       \
        $(SELINUX_CFLAGS)                                       \
        -I$(top_srcdir)/include                                 \
        -I$(top_srcdir)/src                                     \
+       -I$(top_builddir)/src/mapi                              \
        -I$(top_srcdir)/src/mapi                                \
-       -I$(top_builddir)/src/mapi
+       -I$(top_builddir)/src/mapi/glapi                        \
+       -I$(top_srcdir)/src/mapi/glapi
 
 include Makefile.sources
 
 MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
+PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
 
 glapi_gen_mapi_deps := \
        mapi_abi.py \
-       $(wildcard glapi/gen/*.xml) \
-       $(wildcard glapi/gen/*.py)
+       $(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 \
@@ -81,7 +94,8 @@ check_PROGRAMS += shared-glapi-test
 shared_glapi_test_SOURCES = shared-glapi/tests/check_table.cpp
 shared_glapi_test_CPPFLAGS = \
        $(AM_CPPFLAGS) \
-       -I$(top_srcdir)/src/gtest/include
+       -I$(top_srcdir)/src/gtest/include \
+       -I$(top_srcdir)/src/mesa
 shared_glapi_test_LDADD = \
        $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
        $(top_builddir)/src/gtest/libgtest.la
@@ -89,7 +103,7 @@ endif
 
 shared-glapi/glapi_mapi_tmp.h : glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
        $(MKDIR_GEN)
-       $(PYTHON_GEN) $(srcdir)/mapi_abi.py --mode lib --printer shared-glapi \
+       $(PYTHON_GEN) $(srcdir)/mapi_abi.py --printer shared-glapi \
                $(srcdir)/glapi/gen/gl_and_es_API.xml > $@
 
 if HAVE_OPENGL
@@ -106,12 +120,18 @@ 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 += \
@@ -137,7 +157,8 @@ check_PROGRAMS += glapi-test
 glapi_test_SOURCES = glapi/tests/check_table.cpp
 glapi_test_CPPFLAGS = \
        $(AM_CPPFLAGS) \
-       -I$(top_srcdir)/src/gtest/include
+       -I$(top_srcdir)/src/gtest/include \
+       -I$(top_srcdir)/src/mesa
 
 glapi_test_LDADD = \
        $(top_builddir)/src/mapi/glapi/libglapi.la \
@@ -176,14 +197,12 @@ es1api_libGLESv1_CM_la_LDFLAGS = \
        $(GC_SECTIONS) \
        $(LD_NO_UNDEFINED)
 
-if HAVE_SHARED_GLAPI
 es1api_libGLESv1_CM_la_LIBADD += shared-glapi/libglapi.la
 endif
-endif
 
 es1api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
        $(MKDIR_GEN)
-       $(PYTHON_GEN) $(srcdir)/mapi_abi.py --mode lib --printer es1api \
+       $(PYTHON_GEN) $(srcdir)/mapi_abi.py --printer es1api \
                $(srcdir)/glapi/gen/gl_and_es_API.xml > $@
 
 if HAVE_OPENGL_ES2
@@ -202,6 +221,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
 
@@ -222,14 +242,17 @@ es2api_libGLESv2_la_LDFLAGS = \
        $(GC_SECTIONS) \
        $(LD_NO_UNDEFINED)
 
-if HAVE_SHARED_GLAPI
 es2api_libGLESv2_la_LIBADD += shared-glapi/libglapi.la
 endif
-endif
 
 es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
        $(MKDIR_GEN)
-       $(PYTHON_GEN) $(srcdir)/mapi_abi.py --mode lib --printer es2api \
+       $(PYTHON_GEN) $(srcdir)/mapi_abi.py --printer es2api \
                $(srcdir)/glapi/gen/gl_and_es_API.xml > $@
 
 include $(top_srcdir)/install-lib-links.mk
+
+if NEED_KHRPLATFORM
+khrdir = $(includedir)/KHR
+khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h
+endif