[Mesa-stable] [PATCH 01/12] mapi: automake: inline glapi_gen_mapi define
Emil Velikov
emil.l.velikov at gmail.com
Fri Jul 17 10:29:23 PDT 2015
The construct is GNU make specific thus the final Makefile will fail on
systems that lack support for it - namely bmake.
Cc: 10.6 <mesa-stable at lists.freedesktop.org>
Cc: Jonathan Gray <jsg at jsg.id.au>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
src/mapi/Makefile.am | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index 160a255..b30de64 100644
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -55,14 +55,6 @@ glapi_gen_mapi_deps := \
$(wildcard glapi/gen/*.xml) \
$(wildcard glapi/gen/*.py)
-# $(1): path to an XML file
-# $(2): name of the printer
-define glapi_gen_mapi
-@$(MKDIR_P) $(dir $@)
-$(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/mapi_abi.py \
- --mode lib --printer $(2) $(1) > $@
-endef
-
if HAVE_SHARED_GLAPI
BUILT_SOURCES += shared-glapi/glapi_mapi_tmp.h
@@ -93,7 +85,9 @@ shared_glapi_test_LDADD = \
endif
shared-glapi/glapi_mapi_tmp.h : glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
- $(call glapi_gen_mapi,$<,shared-glapi)
+ @$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/mapi_abi.py \
+ --mode lib --printer shared-glapi $< > $@
if HAVE_OPENGL
noinst_LTLIBRARIES = glapi/libglapi.la
@@ -185,7 +179,9 @@ endif
endif
es1api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
- $(call glapi_gen_mapi,$<,es1api)
+ @$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/mapi_abi.py \
+ --mode lib --printer es1api $< > $@
if HAVE_OPENGL_ES2
TESTS += es2api/ABI-check
@@ -229,6 +225,8 @@ endif
endif
es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
- $(call glapi_gen_mapi,$<,es2api)
+ @$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/mapi_abi.py \
+ --mode lib --printer es2api $< > $@
include $(top_srcdir)/install-lib-links.mk
--
2.4.5
More information about the mesa-stable
mailing list