Kaydet (Commit) 47499525 authored tarafından Hans-Joachim Lankenau's avatar Hans-Joachim Lankenau

rebuilded dependency creation - now using makedepend; SECOND_BUILD fix; cleanup

üst 244a188b
This diff is collapsed.
...@@ -12,12 +12,14 @@ ALLDEP .PHONY: ...@@ -12,12 +12,14 @@ ALLDEP .PHONY:
@+-$(RM) $(MISC)$/$(TARGET).dp3 >& $(NULLDEV) @+-$(RM) $(MISC)$/$(TARGET).dp3 >& $(NULLDEV)
@+-$(RM) $(MISC)$/$(TARGET).dpc >& $(NULLDEV) @+-$(RM) $(MISC)$/$(TARGET).dpc >& $(NULLDEV)
@+-$(RM) $(MISC)$/$(TARGET).dpz >& $(NULLDEV) @+-$(RM) $(MISC)$/$(TARGET).dpz >& $(NULLDEV)
@+-$(RM) $(MISC)$/*.dpcc >& $(NULLDEV)
+@echo --- +@echo ---
+@echo Old dependency files removed +@echo Old dependency files removed
+@echo --- +@echo ---
ALLDPC: \ ALLDPC: \
$(DEPFILES) \
$(CFILES) \ $(CFILES) \
$(CXXFILES) \ $(CXXFILES) \
$(RCFILES) \ $(RCFILES) \
...@@ -41,26 +43,26 @@ ALLDPC: \ ...@@ -41,26 +43,26 @@ ALLDPC: \
.IF "$(GUI)"=="UNX" .IF "$(GUI)"=="UNX"
# @+if ( -e $(MISC)$/$(TARGET).dpr ) $(RM) $(MISC)$/$(TARGET).dpr >& $(NULLDEV) # @+if ( -e $(MISC)$/$(TARGET).dpr ) $(RM) $(MISC)$/$(TARGET).dpr >& $(NULLDEV)
@+if ( -e $(MISC)$/$(TARGET).dpw ) $(RM) $(MISC)$/$(TARGET).dpw >& $(NULLDEV) @+if ( -e $(MISC)$/$(TARGET).dpw ) $(RM) $(MISC)$/$(TARGET).dpw >& $(NULLDEV)
@+if ( -e $(MISC)$/$(TARGET).dpj ) $(RM) $(MISC)$/$(TARGET).dpj >& $(NULLDEV)
@+if ( -e $(MISC)$/genjava.mk ) $(RM) $(MISC)$/genjava.mk >& $(NULLDEV) @+if ( -e $(MISC)$/genjava.mk ) $(RM) $(MISC)$/genjava.mk >& $(NULLDEV)
.ELSE .ELSE
# @+-if exist $(MISC)$/$(TARGET).dpr $(RM) $(MISC)$/$(TARGET).dpr >& $(NULLDEV) # @+-if exist $(MISC)$/$(TARGET).dpr $(RM) $(MISC)$/$(TARGET).dpr >& $(NULLDEV)
@+-if exist $(MISC)$/$(TARGET).dpw $(RM) $(MISC)$/$(TARGET).dpw >& $(NULLDEV) @+-if exist $(MISC)$/$(TARGET).dpw $(RM) $(MISC)$/$(TARGET).dpw >& $(NULLDEV)
@+-if exist $(MISC)$/$(TARGET).dpj $(RM) $(MISC)$/$(TARGET).dpj >& $(NULLDEV)
@+-if exist $(MISC)$/genjava.mk $(RM) $(MISC)$/genjava.mk >& $(NULLDEV) @+-if exist $(MISC)$/genjava.mk $(RM) $(MISC)$/genjava.mk >& $(NULLDEV)
.ENDIF .ENDIF
+$(MKDEP) @$(mktmp -O:$(MISC)$/$(TARGET).dpc $(MKDEPFLAGS) \ +touch $(MISC)$/$(TARGET).dpc
$(HDBDEPNTARGET) $(OBJFILES) $(DEPOBJFILES) $(SLOFILES) $(RCFILES) \
$(ALLPARFILES) )
#.IF "$(SVXLIGHTSLOFILES)"!="" #.IF "$(SVXLIGHTSLOFILES)"!=""
# @+$(TYPE) $(mktmp $(foreach,i,$(SVXLIGHTSLOFILES) $(i:d:^"\n")sxl_$(i:f) : $i )) >> $(MISC)$/$(TARGET).dpc # @+$(TYPE) $(mktmp $(foreach,i,$(SVXLIGHTSLOFILES) $(i:d:^"\n")sxl_$(i:f) : $i )) >> $(MISC)$/$(TARGET).dpc
#.ENDIF #.ENDIF
.IF "$(SVXLIGHTOBJFILES)"!="" .IF "$(SVXLIGHTOBJFILES)"!=""
@+$(TYPE) $(mktmp $(foreach,i,$(SVXLIGHTOBJFILES) $(i:d:^"\n")sxl_$(i:f) : $(i:d:s/obj/slo/)$(i:b).obj )) >> $(MISC)$/$(TARGET).dpc @+$(TYPE) $(mktmp $(foreach,i,$(SVXLIGHTOBJFILES) $(i:d:^"\n")sxl_$(i:f) : $(i:d:s/obj/slo/)$(i:b).obj )) >> $(MISC)$/$(TARGET).dpc
.ENDIF .ENDIF
.IF "$($(SECOND_BUILD)SLOFILES)"!="" .IF "$($(SECOND_BUILD)_SLOFILES)"!=""
@+$(TYPE) $(mktmp $(foreach,i,$($(SECOND_BUILD)SLOFILES) $(i:d:^"\n")$(SECOND_BUILD)_$(i:f) : $i )) >> $(MISC)$/$(TARGET).dpc @+$(TYPE) $(mktmp $(foreach,i,$($(SECOND_BUILD)_SLOFILES) $(i:d:^"\n")$(SECOND_BUILD)_$(i:f) : $i )) >> $(MISC)$/$(TARGET).dpc
.ENDIF .ENDIF
.IF "$($(SECOND_BUILD)OBJFILES)"!="" .IF "$($(SECOND_BUILD)_OBJFILES)"!=""
@+$(TYPE) $(mktmp $(foreach,i,$($(SECOND_BUILD)OBJFILES) $(i:d:^"\n")$(SECOND_BUILD)_$(i:f) : $(i:d:s/obj/slo/)$(i:b).obj )) >> $(MISC)$/$(TARGET).dpc @+$(TYPE) $(mktmp $(foreach,i,$($(SECOND_BUILD)_OBJFILES) $(i:d:^"\n")$(SECOND_BUILD)_$(i:f) : $(i:d:s/obj/slo/)$(i:b).obj )) >> $(MISC)$/$(TARGET).dpc
.ENDIF .ENDIF
.IF "$(GROUP)"=="WRITER" .IF "$(GROUP)"=="WRITER"
.IF "$(debug)"=="" .IF "$(debug)"==""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment