diff options
| author | Matt Turner <[email protected]> | 2014-12-12 12:09:34 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2014-12-12 12:11:50 -0800 |
| commit | 3f3aeb53337615b888e605635ac9660e4ada354c (patch) | |
| tree | f0fc00466219fee108544061b61ce36dd1ed4fce /src/mapi | |
| parent | 5ea4b25fba39eb2f26dad24acb55f4c2166f40d1 (diff) | |
mapi: Move rules for generating glapi_mapi_tmp.h out of the conditional.
Allows distcheck to succeed, regardless of how Mesa has been configured.
Diffstat (limited to 'src/mapi')
| -rw-r--r-- | src/mapi/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am index 41352e02fb7..024283c5510 100644 --- a/src/mapi/Makefile.am +++ b/src/mapi/Makefile.am @@ -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 |