diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 11:56:23 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 11:56:23 +0000 |
| commit | 979f3f1f6b7ca71c1e183ecc3aea53c1df2c4ebd (patch) | |
| tree | 080ceb548e05bcf2cc704403ea66a3d7a15ad1ce /solenv/inc/tg_rslb.mk | |
| parent | 66f669394f1faa2289fba972d9cdef8461bdb49a (diff) | |
INTEGRATION: CWS ause069 (1.21.2); FILE MERGED
2006/10/11 12:36:26 hjs 1.21.2.1: #i70359#: removing + sign in targets; adding to tool macro if required
Diffstat (limited to 'solenv/inc/tg_rslb.mk')
| -rw-r--r-- | solenv/inc/tg_rslb.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk index 5f7d537aa29b..a5e1e28d8b6f 100644 --- a/solenv/inc/tg_rslb.mk +++ b/solenv/inc/tg_rslb.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_rslb.mk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.22 $ # -# last change: $Author: kz $ $Date: 2006-10-05 10:41:27 $ +# last change: $Author: obo $ $Date: 2007-01-25 12:56:23 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -46,10 +46,10 @@ RESLIB$(TNR)HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(HIDRES$(TNR)PARTICLE): $(RESLIB$(TNR)HIDFILES) @echo ------------------------------ @echo Making: $@ - @+$(IFEXIST) $@ $(THEN) $(RM) $@ $(FI) + @$(IFEXIST) $@ $(THEN) $(RM) $@ $(FI) # need to strip since solaris cannot handle tab-only whitespace here - +$(TYPE) $(mktmp $(strip, $(subst,$/,/ $(RESLIB$(TNR)HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp - @+$(RENAME) $@.$(ROUT).tmp $@ + $(TYPE) $(mktmp $(strip, $(subst,$/,/ $(RESLIB$(TNR)HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp + @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDRES$(TNR)PARTICLE) @@ -98,15 +98,15 @@ $(RESLIB$(TNR)TARGETN): \ @echo Making: $@ .IF "$(GUI)"=="UNX" .IF "$(common_build_reslib)"!="" - @+-$(RM) $(RSC_MULTI$(TNR)) >& $(NULLDEV) + @-$(RM) $(RSC_MULTI$(TNR)) >& $(NULLDEV) .ELSE # "$(common_build_reslib)"!="" - @+-$(RM) $(RSC_MULTI$(TNR)) >& $(NULLDEV) + @-$(RM) $(RSC_MULTI$(TNR)) >& $(NULLDEV) .ENDIF # "$(common_build_reslib)"!="" .ELSE # "$(GUI)"=="UNX" .IF "$(common_build_reslib)"!="" - @+-$(RM) $(RSC_MULTI$(TNR)) >& $(NULLDEV) + @-$(RM) $(RSC_MULTI$(TNR)) >& $(NULLDEV) .ELSE # "$(common_build_reslib)"!="" - @+-$(RM) $(RSC_MULTI$(TNR)) >& $(NULLDEV) + @-$(RM) $(RSC_MULTI$(TNR)) >& $(NULLDEV) .ENDIF # "$(common_build_reslib)"!="" .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(RESLIB$(TNR)TARGETN)"!="" |