diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 15:39:27 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 15:39:27 +0000 |
| commit | d22c12ebf9ed8699c9f2cd66ac08d5f701d3717d (patch) | |
| tree | f2c46bb209bb5a4d0a5001e964c5b92c20c21a67 /solenv/inc/pstrules.mk | |
| parent | dbaf849d33199c158ae1118f921f45cf1c144a08 (diff) | |
INTEGRATION: CWS ooo20040620 (1.28.76); FILE MERGED
2004/06/06 17:00:17 vq 1.28.76.1: #i29919# rename nul -> $(NULLDEV). This fix was already applied to 112fix2.
Diffstat (limited to 'solenv/inc/pstrules.mk')
| -rw-r--r-- | solenv/inc/pstrules.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk index 01e7667ade8a..3dc4af692c45 100644 --- a/solenv/inc/pstrules.mk +++ b/solenv/inc/pstrules.mk @@ -2,9 +2,9 @@ # # $RCSfile: pstrules.mk,v $ # -# $Revision: 1.29 $ +# $Revision: 1.30 $ # -# last change: $Author: hjs $ $Date: 2004-06-25 16:11:58 $ +# last change: $Author: rt $ $Date: 2004-07-13 16:39:27 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -78,7 +78,7 @@ $(OBJ)$/sxl_%.obj : %.cxx $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ .ELSE - @+if exist $@ $(RM) /q $@ >& nul + @+if exist $@ $(RM) /q $@ >& $(NULLDEV) $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx .ENDIF @@ -96,7 +96,7 @@ $(SLO)$/sxl_%.obj : %.cxx $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ .ELSE - @+if exist $@ $(RM) /q $@ >& nul + @+if exist $@ $(RM) /q $@ >& $(NULLDEV) $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx .ENDIF @@ -120,7 +120,7 @@ $(OBJ)$/$(SECOND_BUILD)_%.obj : %.cxx $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ .ELSE - @+if exist $@ $(RM) /q $@ >& nul + @+if exist $@ $(RM) /q $@ >& $(NULLDEV) $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx .ENDIF |