From 723511bb32900a8e2f463a2622c7e9a908f64583 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Mon, 3 May 2010 08:32:56 -0400
Subject: [PATCH] Generate es glapi files when es1 or es2 is enabled

---
 src/mesa/Makefile          | 8 +++++++-
 src/mesa/es/glapi/Makefile | 5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 5403d28..72f983e 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 a388f07..fea5559 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)
-- 
2.7.4