Ticket #2810: patch-libraries__source__fcollada__src__Makefile

File patch-libraries__source__fcollada__src__Makefile, 1.5 KB (added by Guido Falsi, 10 years ago)

Race condition fix

Line 
1--- libraries/source/fcollada/src/Makefile.orig 2014-08-25 09:40:53 UTC
2+++ libraries/source/fcollada/src/Makefile
3@@ -224,7 +224,7 @@
4 OBJECTS_TEST = $(addprefix output/test/,$(SOURCE:.cpp=.o) $(TEST_SOURCE:.cpp=.o))
5 OBJECTS_ALL = $(OBJECTS_DEBUG) $(OBJECTS_RELEASE) $(OBJECTS_TEST)
6
7-all: output_dirs output/libFColladaSD.a output/libFColladaSR.a install
8+all: output/libFColladaSD.a output/libFColladaSR.a install | output_dirs
9
10 output_dirs:
11 bash -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}'
12@@ -233,11 +233,11 @@
13 ( cd FCollada/FColladaTest/ ; ../../output/FColladaTest )
14 cat FCollada/FColladaTest/FColladaTestLog.txt
15
16-output/libFColladaSD.a: $(OBJECTS_DEBUG)
17+output/libFColladaSD.a: $(OBJECTS_DEBUG) | output_dirs
18 @echo "$@"
19 @ar -cr $@ $(OBJECTS_DEBUG); ranlib $@
20
21-output/libFColladaSR.a: $(OBJECTS_RELEASE)
22+output/libFColladaSR.a: $(OBJECTS_RELEASE) | output_dirs
23 @echo "$@"
24 @ar -cr $@ $(OBJECTS_RELEASE); ranlib $@
25
26@@ -255,11 +255,11 @@
27 sed -e 's/\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
28 -e '/^$$/ d' -e 's/$$/ :/' < $(dfile) >> $(Pfile) && \
29 rm -f $(dfile)
30-output/debug/%.o: %.cpp
31+output/debug/%.o: %.cpp | output_dirs
32 @echo "$<"
33 $(CXX) $(CXXFLAGS) $(CXXFLAGS_DEBUG) $(INCLUDES) -MD -MF $(dfile) -c $< -o $@
34 $(gendep)
35-output/release/%.o: %.cpp
36+output/release/%.o: %.cpp | output_dirs
37 @echo "$<"
38 $(CXX) $(CXXFLAGS) $(CXXFLAGS_RELEASE) $(INCLUDES) -MD -MF $(dfile) -c $< -o $@
39 $(gendep)