mesa: add KHR_no_error support for glUniformBlockBinding()

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

diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index 5013e9af5e1452f08761eaff659529db549bb986..9ff70a14fddaaf20a0606c22851f340362a60e44 100644 (file)
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -46,8 +46,8 @@ 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
 
@@ -93,7 +93,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
@@ -187,14 +187,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
@@ -234,14 +232,15 @@ 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
+
+khrdir = $(includedir)/KHR
+khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h