kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Added dependency to make destination directory before compiling a file.

Browse Source 
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
This commit is contained in:
Kent Mein 2006-11-16 18:28:57 +00:00
parent ca21bf8a60
commit 0de1fd9086
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/nan_compile.mk
View File

@ -255,7 +255,7 @@ include nan_warn.mk
default: all default: all
$(DIR)/$(DEBUG_DIR)%.o: %.c $(DIR)/$(DEBUG_DIR)%.o: %.c makedir
ifdef NAN_DEPEND ifdef NAN_DEPEND
@set -e; $(CC) -M $(CPPFLAGS) $< 2>/dev/null \ @set -e; $(CC) -M $(CPPFLAGS) $< 2>/dev/null \
| sed 's@\($*\)\.o[ :]*@$(DIR)/$(DEBUG_DIR)\1.o : @g' \ | sed 's@\($*\)\.o[ :]*@$(DIR)/$(DEBUG_DIR)\1.o : @g' \
@ -269,7 +269,7 @@ $(DIR)/$(DEBUG_DIR)%.o: %.c
$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
endif endif
$(DIR)/$(DEBUG_DIR)%.o: %.cpp $(DIR)/$(DEBUG_DIR)%.o: %.cpp makedir
ifdef NAN_DEPEND ifdef NAN_DEPEND
@set -e; $(CCC) -M $(CPPFLAGS) $< 2>/dev/null \ @set -e; $(CCC) -M $(CPPFLAGS) $< 2>/dev/null \
| sed 's@\($*\)\.o[ :]*@$(DIR)/$(DEBUG_DIR)\1.o : @g' \ | sed 's@\($*\)\.o[ :]*@$(DIR)/$(DEBUG_DIR)\1.o : @g' \
@ -283,21 +283,21 @@ $(DIR)/$(DEBUG_DIR)%.o: %.cpp
$(CCC) -c $(CCFLAGS) $(CPPFLAGS) $< -o $@ $(CCC) -c $(CCFLAGS) $(CPPFLAGS) $< -o $@
endif endif
$(DIR)/$(DEBUG_DIR)%.res: %.rc $(DIR)/$(DEBUG_DIR)%.res: %.rc makedir
ifeq ($(FREE_WINDOWS),true) ifeq ($(FREE_WINDOWS),true)
windres $< -O coff -o $@ windres $< -O coff -o $@
else else
$(SRCHOME)/tools/cygwin/cl_wrapper.pl - rc /fo$@ $< $(SRCHOME)/tools/cygwin/cl_wrapper.pl - rc /fo$@ $<
endif endif
$(DIR)/$(DEBUG_DIR)%.class: %.java $(DIR)/$(DEBUG_DIR)%.class: %.java makedir
ifdef JARS ifdef JARS
$(JAVAC) -verbose -g -deprecation -sourcepath . -classpath "$(JARS)" -d $(DIR)/$(DEBUG_DIR) $< $(JAVAC) -verbose -g -deprecation -sourcepath . -classpath "$(JARS)" -d $(DIR)/$(DEBUG_DIR) $<
else else
$(JAVAC) -verbose -g -deprecation -d $(DIR)/$(DEBUG_DIR) $< $(JAVAC) -verbose -g -deprecation -d $(DIR)/$(DEBUG_DIR) $<
endif 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 $* $(JAVAH) -classpath $(DIR)/$(DEBUG_DIR) -d $(DIR)/$(DEBUG_DIR) -jni $*
%.h: %.h: