fix parallel make: add object dependency on $(OBJ_DIR)/target

This commit is contained in:
jvdias 2006-04-11 02:35:33 +00:00
parent 40faa82d02
commit 5aaef22661

View File

@ -0,0 +1,29 @@
--- pegasus/mak/objects-unix.mak.parallel_make 2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/objects-unix.mak 2006-04-10 16:58:30.000000000 -0400
@@ -50,7 +50,7 @@
ifeq ($(_NO_TMP_O), yes)
-$(OBJ_DIR)/%.o: %.cpp $(ERROR)
+$(OBJ_DIR)/%.o: $(OBJ_DIR)/target %.cpp $(ERROR)
$(CXX) -c -o $@ $(FLAGS) $(EXTRA_CXX_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.cpp
@ $(TOUCH) $@
@ $(ECHO)
@@ -64,7 +64,7 @@
endif
ifeq ($(_NO_TMP_O), yes)
-$(OBJ_DIR)/%.o: %.c $(ERROR)
+$(OBJ_DIR)/%.o: $(OBJ_DIR)/target %.c $(ERROR)
$(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.c
@ $(TOUCH) $@
@ $(ECHO)
@@ -78,7 +78,7 @@
endif
ifeq ($(_NO_TMP_O), yes)
-$(OBJ_DIR)/%.o: %.s $(ERROR)
+$(OBJ_DIR)/%.o: $(OBJ_DIR)/target %.s $(ERROR)
$(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.s
@ $(TOUCH) $@
@ $(ECHO)