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 e5477364ce53717d2ba6e9dd35feeb6f7431d7b5..5a619bf049b2811caf43003beff68b0aefb8c93a 100644 (file)
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -31,12 +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 \
        glapi/registry/gl.xml \
-       shared-glapi/SConscript
+       shared-glapi/SConscript \
+       es1api/meson.build \
+       es2api/meson.build \
+       glapi/meson.build \
+       shared-glapi/meson.build \
+       meson.build
 
 AM_CFLAGS = \
        $(PTHREAD_CFLAGS) \
@@ -47,12 +54,14 @@ AM_CPPFLAGS =                                                       \
        -I$(top_srcdir)/include                                 \
        -I$(top_srcdir)/src                                     \
        -I$(top_builddir)/src/mapi                              \
-       -I$(top_srcdir)/src/mapi
+       -I$(top_srcdir)/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 \
@@ -85,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
@@ -113,7 +123,6 @@ endif
 glapi_libglapi_la_SOURCES =
 glapi_libglapi_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
-       -I$(top_srcdir)/src/mapi/glapi \
        -I$(top_srcdir)/src/mesa
 
 if HAVE_APPLEDRI
@@ -148,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 \
@@ -241,3 +251,8 @@ es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
                $(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