aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/glapi/gen
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-05-30 12:28:02 +0200
committermarha <marha@users.sourceforge.net>2012-05-30 12:28:02 +0200
commite48563d326cebfe5d7110b64b922120dd37ffe4c (patch)
tree5439271c5a4211e1d7b6261147a5322e31eaac29 /mesalib/src/mapi/glapi/gen
parent64385e98e48e5d44d0d5a8923fc9f7049e4ea7ab (diff)
parente4580373a81894c451e5933b24906a075828b77e (diff)
downloadvcxsrv-e48563d326cebfe5d7110b64b922120dd37ffe4c.tar.gz
vcxsrv-e48563d326cebfe5d7110b64b922120dd37ffe4c.tar.bz2
vcxsrv-e48563d326cebfe5d7110b64b922120dd37ffe4c.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mapi/glapi/gen')
-rw-r--r--mesalib/src/mapi/glapi/gen/Makefile3
-rw-r--r--mesalib/src/mapi/glapi/gen/glapi_gen.mk6
2 files changed, 5 insertions, 4 deletions
diff --git a/mesalib/src/mapi/glapi/gen/Makefile b/mesalib/src/mapi/glapi/gen/Makefile
index 49dfd75bf..5ca7050a9 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile
+++ b/mesalib/src/mapi/glapi/gen/Makefile
@@ -121,7 +121,8 @@ COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py
######################################################################
-all: mesa xorg
+all: mesa
+install: mesa
mesa: $(MESA_OUTPUTS)
diff --git a/mesalib/src/mapi/glapi/gen/glapi_gen.mk b/mesalib/src/mapi/glapi/gen/glapi_gen.mk
index c7fa7c015..1b05a405b 100644
--- a/mesalib/src/mapi/glapi/gen/glapi_gen.mk
+++ b/mesalib/src/mapi/glapi/gen/glapi_gen.mk
@@ -17,7 +17,7 @@ glapi_gen_mapi_deps := \
# $(2): name of the printer
define glapi_gen_mapi
@mkdir -p $(dir $@)
-$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_mapi_script) \
+$(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_mapi_script) \
--mode lib --printer $(2) $(1) > $@
endef
@@ -28,7 +28,7 @@ glapi_gen_dispatch_deps := $(glapi_gen_common_deps)
# $(2): empty, es1, or es2 for entry point filtering
define glapi_gen_dispatch
@mkdir -p $(dir $@)
-$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_dispatch_script) \
+$(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_dispatch_script) \
-f $(1) -m remap_table $(if $(2),-c $(2),) > $@
endef
@@ -39,6 +39,6 @@ glapi_gen_remap_deps := $(glapi_gen_common_deps)
# $(2): empty, es1, or es2 for entry point filtering
define glapi_gen_remap
@mkdir -p $(dir $@)
-$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_remap_script) \
+$(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_remap_script) \
-f $(1) $(if $(2),-c $(2),) > $@
endef