mapi: Move rules for generating glapi_mapi_tmp.h out of the conditional.
authorMatt Turner <mattst88@gmail.com>
Fri, 12 Dec 2014 20:09:34 +0000 (12:09 -0800)
committerMatt Turner <mattst88@gmail.com>
Fri, 12 Dec 2014 20:11:50 +0000 (12:11 -0800)
Allows distcheck to succeed, regardless of how Mesa has been configured.

src/mapi/Makefile.am

index 41352e02fb7820394f25e35018a025a3102dd116..024283c55105c9dc1e0adb9c43ae1633b8e958e9 100644 (file)
@@ -69,9 +69,6 @@ shared_glapi_libglapi_la_LDFLAGS = \
        $(GC_SECTIONS) \
        $(LD_NO_UNDEFINED)
 
-shared-glapi/glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
-       $(call glapi_gen_mapi,$<,shared-glapi)
-
 TESTS += shared-glapi-test
 check_PROGRAMS += shared-glapi-test
 
@@ -84,6 +81,9 @@ shared_glapi_test_LDADD = \
        $(top_builddir)/src/gtest/libgtest.la
 endif
 
+shared-glapi/glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
+       $(call glapi_gen_mapi,$<,shared-glapi)
+
 if HAVE_OPENGL
 noinst_LTLIBRARIES = glapi/libglapi.la
 
@@ -165,10 +165,10 @@ es1api_libGLESv1_CM_la_LDFLAGS = \
 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)
        $(call glapi_gen_mapi,$<,es1api)
-endif
 
 if HAVE_OPENGL_ES2
 TESTS += es2api/ABI-check
@@ -209,10 +209,10 @@ es2api_libGLESv2_la_LDFLAGS = \
 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)
        $(call glapi_gen_mapi,$<,es2api)
-endif
 
 if HAVE_OPENVG
 SUBDIRS += vgapi