Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2006-11-16 21:28:57 +0300
committerKent Mein <mein@cs.umn.edu>2006-11-16 21:28:57 +0300
commit0de1fd9086019fc09ab4bc07d371af69acbee913 (patch)
tree6495111fe67672f3d18d8ab70cad0b9cede737b8 /source/nan_compile.mk
parentca21bf8a600ada605e699c74dfaf27720bd6d3c5 (diff)
Added dependency to make destination directory before compiling a file.
This is needed for make -j# where # is > 1 This doesn't totally fix everything for make -j2 but it makes things mostly work. Kent
Diffstat (limited to 'source/nan_compile.mk')
-rw-r--r--source/nan_compile.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/nan_compile.mk b/source/nan_compile.mk
index d356d13be42..9463f357175 100644
--- a/source/nan_compile.mk
+++ b/source/nan_compile.mk
@@ -255,7 +255,7 @@ include nan_warn.mk
default: all
-$(DIR)/$(DEBUG_DIR)%.o: %.c
+$(DIR)/$(DEBUG_DIR)%.o: %.c makedir
ifdef NAN_DEPEND
@set -e; $(CC) -M $(CPPFLAGS) $< 2>/dev/null \
| sed 's@\($*\)\.o[ :]*@$(DIR)/$(DEBUG_DIR)\1.o : @g' \
@@ -269,7 +269,7 @@ $(DIR)/$(DEBUG_DIR)%.o: %.c
$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
endif
-$(DIR)/$(DEBUG_DIR)%.o: %.cpp
+$(DIR)/$(DEBUG_DIR)%.o: %.cpp makedir
ifdef NAN_DEPEND
@set -e; $(CCC) -M $(CPPFLAGS) $< 2>/dev/null \
| sed 's@\($*\)\.o[ :]*@$(DIR)/$(DEBUG_DIR)\1.o : @g' \
@@ -283,21 +283,21 @@ $(DIR)/$(DEBUG_DIR)%.o: %.cpp
$(CCC) -c $(CCFLAGS) $(CPPFLAGS) $< -o $@
endif
-$(DIR)/$(DEBUG_DIR)%.res: %.rc
+$(DIR)/$(DEBUG_DIR)%.res: %.rc makedir
ifeq ($(FREE_WINDOWS),true)
windres $< -O coff -o $@
else
$(SRCHOME)/tools/cygwin/cl_wrapper.pl - rc /fo$@ $<
endif
-$(DIR)/$(DEBUG_DIR)%.class: %.java
+$(DIR)/$(DEBUG_DIR)%.class: %.java makedir
ifdef JARS
$(JAVAC) -verbose -g -deprecation -sourcepath . -classpath "$(JARS)" -d $(DIR)/$(DEBUG_DIR) $<
else
$(JAVAC) -verbose -g -deprecation -d $(DIR)/$(DEBUG_DIR) $<
endif
-$(DIR)/$(DEBUG_DIR)%.h: $(DIR)/$(DEBUG_DIR)%.class
+$(DIR)/$(DEBUG_DIR)%.h: $(DIR)/$(DEBUG_DIR)%.class makedir
$(JAVAH) -classpath $(DIR)/$(DEBUG_DIR) -d $(DIR)/$(DEBUG_DIR) -jni $*
%.h: