summaryrefslogtreecommitdiff
path: root/src/mesa/es/Makefile
diff options
context:
space:
mode:
authorChia-I Wu <olvaffe@gmail.com>2009-11-06 15:17:15 +0800
committerBrian Paul <brianp@vmware.com>2009-11-06 14:19:23 -0700
commit37dca7955a55c0d1422dffa8a65d5b4ebe143d47 (patch)
tree1c28528bf03a95ef2e19b31c4ff59504a54a748d /src/mesa/es/Makefile
parentf1c7874cd95e19929030038a78d889ac095a122a (diff)
mesa/es: Improve support for parallel execution of make.
Running make with -j for the first time might fail because glapi headers haven't been generated. This commit should make it more reliable. Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Diffstat (limited to 'src/mesa/es/Makefile')
-rw-r--r--src/mesa/es/Makefile14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/mesa/es/Makefile b/src/mesa/es/Makefile
index 48b11a6ad2..8cf2eaccab 100644
--- a/src/mesa/es/Makefile
+++ b/src/mesa/es/Makefile
@@ -110,11 +110,17 @@ clean:
# nothing to install
install:
-subdirs:
- make -C glapi
- make -C $(MESA) asm_subdirs
+glapi/glapi-stamp:
+ $(MAKE) -C glapi
-depend: $(ES1_ALL_SOURCES) $(ES2_ALL_SOURCES)
+subdirs: glapi/glapi-stamp
+ $(MAKE) -C $(MESA) asm_subdirs
+
+# remove generated sources because "depend" is checked even when "make clean"
+DEPEND_SOURCES := $(filter-out $(GENERATED_SOURCES), $(ES1_ALL_SOURCES) $(ES2_ALL_SOURCES))
+DEPEND_SOURCES := $(filter-out glapi/%, $(DEPEND_SOURCES))
+
+depend: glapi/glapi-stamp $(DEPEND_SOURCES)
@echo "running $(MKDEP)"
@touch depend
@# MESA is "..", but luckily, directories are longer than 2 characters