summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2010-05-03 08:32:56 -0400
committerKristian Høgsberg <krh@bitplanet.net>2010-05-03 08:33:23 -0400
commit723511bb32900a8e2f463a2622c7e9a908f64583 (patch)
tree5a40abb4ac04d591e8752ffd795593ea6004d413 /src
parent9db4a211e96356deb963223038eea074a5fe0eda (diff)
Generate es glapi files when es1 or es2 is enabled
Diffstat (limited to 'src')
-rw-r--r--src/mesa/Makefile8
-rw-r--r--src/mesa/es/glapi/Makefile5
2 files changed, 11 insertions, 2 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 5403d28f32..72f983e10a 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -21,9 +21,15 @@ CFLAGS += $(API_DEFINES)
# Default: build dependencies, then asm_subdirs, GLSL built-in lib,
# then convenience libs (.a) and finally the device drivers:
-default: depend asm_subdirs glsl_builtin libmesa.a libmesagallium.a \
+default: depend es_glapi asm_subdirs glsl_builtin libmesa.a libmesagallium.a \
libglapi.a driver_subdirs
+es_glapi:
+ @for api in $(APIS) ; do \
+ case "$$api" in \
+ es1|es2) $(MAKE) -C es/glapi $$api;; \
+ esac; \
+ done
main/api_exec_es1.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py
$(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES1.1 > $@
diff --git a/src/mesa/es/glapi/Makefile b/src/mesa/es/glapi/Makefile
index a388f073cf..fea55594fd 100644
--- a/src/mesa/es/glapi/Makefile
+++ b/src/mesa/es/glapi/Makefile
@@ -29,7 +29,10 @@ ES2_DEPS = $(ES2_APIXML) base2_API.xml es2_EXT.xml es_EXT.xml \
ES1_OUTPUTS := $(addprefix $(ES1_OUTPUT_DIR)/, $(OUTPUTS))
ES2_OUTPUTS := $(addprefix $(ES2_OUTPUT_DIR)/, $(OUTPUTS))
-all: $(ES1_OUTPUTS) $(ES2_OUTPUTS)
+all: es1 es2
+
+es1: $(ES1_OUTPUTS)
+es2: $(ES2_OUTPUTS)
$(ES1_OUTPUTS): APIXML := $(ES1_APIXML)
$(ES2_OUTPUTS): APIXML := $(ES2_APIXML)