diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2007-02-06 12:58:46 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2007-02-06 12:58:46 +0000 |
commit | 65e10dcc586ebbfb2c5c6567b3a61e8d663d7a8a (patch) | |
tree | 4adb36bb77e2ef1675f978670f88d19bb0e9d945 | |
parent | 7377f93b8b3d31fd9d803abbbd14cf59bb4d9c68 (diff) |
INTEGRATION: CWS ause074 (1.61.8); FILE MERGED
2007/02/02 11:46:51 hjs 1.61.8.1: #i74085# avoid useless shell calls
-rw-r--r-- | solenv/inc/tg_app.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk index d4d852e1cea3..d1c7bdc2dc34 100644 --- a/solenv/inc/tg_app.mk +++ b/solenv/inc/tg_app.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_app.mk,v $ # -# $Revision: 1.61 $ +# $Revision: 1.62 $ # -# last change: $Author: hjs $ $Date: 2007-01-26 10:58:51 $ +# last change: $Author: vg $ $Date: 2007-02-06 13:58:46 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -81,7 +81,7 @@ APP$(TNR)PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP$(TNR)PRODUCTNAME)\" .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" $(MISC)$/$(APP$(TNR)TARGET)_linkinc.ls .PHONY: - @-$(RM) $@ >& $(NULLDEV) + @@-$(RM) $@ sed -f $(COMMON_ENV_TOOLS)$/chrel.sed $(foreach,i,$(APP$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF @@ -132,9 +132,9 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ .ENDIF # "$(OS)"=="MACOSX" .ENDIF .IF "$(GUI)" == "WNT" - @-$(MKDIR) $(@:d:d) >& $(NULLDEV) + @@-$(MKDIR) $(@:d:d) .IF "$(APP$(TNR)LINKRES)" != "" - @-$(RM) $(MISC)$/$(APP$(TNR)LINKRES:b).rc >& $(NULLDEV) + @@-$(RM) $(MISC)$/$(APP$(TNR)LINKRES:b).rc .IF "$(APP$(TNR)ICON)" != "" .IF "$(USE_SHELL)"=="4nt" @-echo 1 ICON "$(APP$(TNR)ICON:s/\/\\/)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc |