mesa: move LONGSTRING into generated enums.c

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

diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index b0a6c8ca2d82d819eaf6f63d2271cda94d983435..50c5b2ebba32eae9af94a2588472b91136491d98 100644 (file)
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -46,6 +46,7 @@ AM_CPPFLAGS =                                                 \
        $(DEFINES)                                              \
        $(SELINUX_CFLAGS)                                       \
        -I$(top_srcdir)/include                                 \
+       -I$(top_srcdir)/src                                     \
        -I$(top_srcdir)/src/mapi                                \
        -I$(top_builddir)/src/mapi
 
@@ -68,7 +69,7 @@ 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_libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) shared-glapi/glapi_mapi_tmp.h
 shared_glapi_libglapi_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -DMAPI_MODE_GLAPI \
@@ -117,7 +118,7 @@ glapi_libglapi_la_CPPFLAGS = \
        -I$(top_srcdir)/src/mesa
 
 if HAVE_SHARED_GLAPI
-glapi_libglapi_la_SOURCES += $(MAPI_BRIDGE_FILES)
+glapi_libglapi_la_SOURCES += $(MAPI_BRIDGE_FILES) glapi/glapi_mapi_tmp.h
 glapi_libglapi_la_CPPFLAGS += \
        -DMAPI_MODE_BRIDGE \
        -DMAPI_ABI_HEADER=\"glapi/glapi_mapi_tmp.h\"
@@ -232,10 +233,4 @@ endif
 es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
        $(call glapi_gen_mapi,$<,es2api)
 
-# XXX: Inline vgapi's Makefile.am here.
-EXTRA_DIST += vgapi
-# if HAVE_OPENVG
-# SUBDIRS += vgapi
-# endif
-
 include $(top_srcdir)/install-lib-links.mk