This reverts the dependancy stuff I did for make -j#

It was causing all of blender to be rebuilt every single time.
Need to do more to figure it out before we add this back in.

Kent
This commit is contained in:
Kent Mein 2006-11-17 18:29:46 +00:00
parent 28769382d2
commit 35d3781757
1 changed files with 5 additions and 5 deletions

View File

@ -255,7 +255,7 @@ include nan_warn.mk
default: all
$(DIR)/$(DEBUG_DIR)%.o: %.c makedir
$(DIR)/$(DEBUG_DIR)%.o: %.c
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 makedir
$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
endif
$(DIR)/$(DEBUG_DIR)%.o: %.cpp makedir
$(DIR)/$(DEBUG_DIR)%.o: %.cpp
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 makedir
$(CCC) -c $(CCFLAGS) $(CPPFLAGS) $< -o $@
endif
$(DIR)/$(DEBUG_DIR)%.res: %.rc makedir
$(DIR)/$(DEBUG_DIR)%.res: %.rc
ifeq ($(FREE_WINDOWS),true)
windres $< -O coff -o $@
else
$(SRCHOME)/tools/cygwin/cl_wrapper.pl - rc /fo$@ $<
endif
$(DIR)/$(DEBUG_DIR)%.class: %.java makedir
$(DIR)/$(DEBUG_DIR)%.class: %.java
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 makedir
$(DIR)/$(DEBUG_DIR)%.h: $(DIR)/$(DEBUG_DIR)%.class
$(JAVAH) -classpath $(DIR)/$(DEBUG_DIR) -d $(DIR)/$(DEBUG_DIR) -jni $*
%.h: