diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-03-18 09:12:55 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-03-18 09:12:55 +0000 |
| commit | 8f7b05a6b9631583c18b1caec13fdb7e1bad6bf7 (patch) | |
| tree | f7f5c2de672529219b36d0f2fba059d75c572a32 /solenv/inc/pstrules.mk | |
| parent | 7f6039b81cc0052253a8051348bf66c785d412e3 (diff) | |
INTEGRATION: CWS vq12 (1.34.74); FILE MERGED
2005/02/20 18:09:44 vq 1.34.74.1: #i29609# Use $(IFEXIST) and $(THEN) macros to use the correct syntax
for W32-4nt or W32-tcsh.
Diffstat (limited to 'solenv/inc/pstrules.mk')
| -rw-r--r-- | solenv/inc/pstrules.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk index 1d4b0eb89452..75580c9d8c5e 100644 --- a/solenv/inc/pstrules.mk +++ b/solenv/inc/pstrules.mk @@ -78,7 +78,7 @@ $(OBJ)$/sxl_%.obj : %.cxx .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ .ELSE - @+if exist $@ $(RM) /q $@ >& $(NULLDEV) + @+$(IFEXIST) $@ $(THEN) $(RM) $@ >& $(NULLDEV) $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx .ENDIF @@ -99,7 +99,7 @@ $(SLO)$/sxl_%.obj : %.cxx .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ .ELSE - @+if exist $@ $(RM) /q $@ >& $(NULLDEV) + @+$(IFEXIST) $@ $(THEN) $(RM) $@ >& $(NULLDEV) $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx .ENDIF @@ -126,7 +126,7 @@ $(OBJ)$/$(SECOND_BUILD)_%.obj : %.cxx .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ .ELSE - @+if exist $@ $(RM) /q $@ >& $(NULLDEV) + @+$(IFEXIST) $@ $(THEN) $(RM) $@ >& $(NULLDEV) $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx .ENDIF |