dependency fixes for *.scp and *.rc

solenv/inc/rules.mk

@@ -2,9 +2,9 @@
 #
 #   $RCSfile: rules.mk,v $
 #
-#   $Revision: 1.12 $
+#   $Revision: 1.13 $
 #
-#   last change: $Author: hjs $ $Date: 2001-02-05 14:55:54 $
+#   last change: $Author: hjs $ $Date: 2001-02-05 19:59:43 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -386,8 +386,16 @@ $(MISC)$/%.dpcc :
     @echo Making: $@
     @+-$(RM) $@ >& $(NULLDEV)
     @+-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV)
-    makedepend -f - -p$(OBJ)$/ -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) -DDLLSUFFIX=$(DLLSUFFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $@
+    makedepend -f - -p$(PAR)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/ -o.par -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) -DDLLSUFFIX=$(DLLSUFFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $@
 
+# dependencies rc files (native resources for windows)
+
+$(MISC)$/%.dprc : 
+    @echo ------------------------------
+    @echo Making: $@
+    @+-$(RM) $@ >& $(NULLDEV)
+    @+-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV)
+    makedepend -f - -p$(RES)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/ -o.res $(RCLANGFLAGS_{$(subst,$(@:d:d:d:u), $(@:d:d:u))}:u:s/ //) $(CDEFS) -DDLLSUFFIX=$(DLLSUFFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).rc >> $@
 
 .IF "$(MAKEFILERC)"==""
 $(MISC)$/%.dpc : $(CFILES) $(CXXFILES) $(RCFILES) $(UNOIDLTARGETS) $(SLOFILES) $(OBJFILES)

solenv/inc/target.mk

@@ -2,9 +2,9 @@
 #
 #   $RCSfile: target.mk,v $
 #
-#   $Revision: 1.27 $
+#   $Revision: 1.28 $
 #
-#   last change: $Author: hjs $ $Date: 2001-02-02 13:58:54 $
+#   last change: $Author: hjs $ $Date: 2001-02-05 19:59:42 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -146,6 +146,14 @@ DEPFILESx+=$(subst,$(SLO)$/,$(MISC)$/s_ $(subst,$(OBJ)$/,$(MISC)$/o_ $(DEPOBJFIL
 DEPFILESx+=$(subst,$(OBJ)$/,$(MISC)$/o_ $(OBJFILES:s/.obj/.dpcc/))
 DEPFILESx+=$(subst,$(SLO)$/,$(MISC)$/s_ $(SLOFILES:s/.obj/.dpcc/))
 DEPFILESx+=$(subst,$(PAR),$(MISC) $(ALLPARFILES:s/.par/.dpcc/))
+.IF "$(RCFILES)"!=""
+.IF "$(RESNAME)"!=""
+#RCTARGET!:=$(foreach,i,$(alllangext) $(RES)$/$i$/$(RESNAME).res)
+DEPFILESx+=$(MISC)$/$(RESNAME).dpcc
+.ELSE			# "$(RESNAME)"!=""
+DEPFILESx+=$(foreach,i,$(alllangext) $(MISC)$/$i$/$(TARGET).dprc)
+.ENDIF			# "$(RESNAME)"!=""
+.ENDIF			# "$(RCFILES)"!=""
 DEPFILES=$(uniq $(DEPFILESx))
 
 .IF "$(TESTOBJECTS)"!=""
@@ -166,10 +174,10 @@ something_wrong_with_objects :
 .ENDIF			# "$(DEPFILES_TEST)"!=""
 .ENDIF			# "$(TESTOBJECTS)"!=""
 
-.IF "$(depend)" == ""
-
 .INCLUDE : postset.mk
 
+.IF "$(depend)" == ""
+
 # -------
 # - ALL -
 # -------

solenv/inc/tg_dep.mk

@@ -13,6 +13,12 @@ ALLDEP .PHONY:
     @+-$(RM) $(MISC)$/$(TARGET).dpc >& $(NULLDEV)
     @+-$(RM) $(MISC)$/$(TARGET).dpz >& $(NULLDEV)
     @+-$(RM) $(MISC)$/*.dpcc >& $(NULLDEV)
+.IF "$(PARFILES)"!=""
+    @+-$(RM) $(foreach,i,$(SCP_PRODUCT_TYPE) $(MISC)$/$i$/*.dpcc) >& $(NULLDEV)
+.ENDIF
+.IF "$(RCFILES)"!=""
+    @+-$(RM) $(foreach,i,$(alllangext) $(MISC)$/$i$/*.dprc) >& $(NULLDEV)
+.ENDIF
     +@echo ---
     +@echo      Old dependency files removed
     +@echo ---