fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 13:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

mesa/es: Improve support for parallel execution of make.

Browse source 
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>
This commit is contained in:
Chia-I Wu 2009-11-06 15:17:15 +08:00 • committed by Brian Paul
parent f1c7874cd9
commit 37dca7955a
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/mesa/es/Makefile
View file

@ -110,11 +110,17 @@ clean:
# nothing to install # nothing to install
install: install:
subdirs: glapi/glapi-stamp:
make -C glapi $(MAKE) -C glapi
make -C $(MESA) asm_subdirs
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)" @echo "running $(MKDEP)"
@touch depend @touch depend
@# MESA is "..", but luckily, directories are longer than 2 characters @# MESA is "..", but luckily, directories are longer than 2 characters

6
src/mesa/es/glapi/Makefile
View file

@ -30,7 +30,10 @@ ES2_DEPS = $(ES2_APIXML) base2_API.xml es2_EXT.xml es_EXT.xml \
ES1_OUTPUTS := $(addprefix $(ES1_OUTPUT_DIR)/, $(OUTPUTS)) ES1_OUTPUTS := $(addprefix $(ES1_OUTPUT_DIR)/, $(OUTPUTS))
ES2_OUTPUTS := $(addprefix $(ES2_OUTPUT_DIR)/, $(OUTPUTS)) ES2_OUTPUTS := $(addprefix $(ES2_OUTPUT_DIR)/, $(OUTPUTS))
all: $(ES1_OUTPUTS) $(ES2_OUTPUTS) all: glapi-stamp
glapi-stamp: $(ES1_OUTPUTS) $(ES2_OUTPUTS)
@touch glapi-stamp
$(ES1_OUTPUTS): APIXML := $(ES1_APIXML) $(ES1_OUTPUTS): APIXML := $(ES1_APIXML)
$(ES2_OUTPUTS): APIXML := $(ES2_APIXML) $(ES2_OUTPUTS): APIXML := $(ES2_APIXML)
@ -86,5 +89,6 @@ verify_xml:
@rm -f tmp.xml @rm -f tmp.xml
clean: clean:
-rm -f glapi-stamp
-rm -rf $(ES1_OUTPUT_DIR) $(ES2_OUTPUT_DIR) -rm -rf $(ES1_OUTPUT_DIR) $(ES2_OUTPUT_DIR)
-rm -f *~ *.pyc *.pyo -rm -f *~ *.pyc *.pyo