diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 13:51:15 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 13:51:15 +0000 |
| commit | 3ae65e6dd8a4ade0cfcb852efd1973bbb98a4dc6 (patch) | |
| tree | 58e7176c237d65f9def3c692c28f8cf89fbb0482 /solenv/inc/tg_obj.mk | |
| parent | 85179eeecadd91ecb9772200a2aa3730c28f58bd (diff) | |
INTEGRATION: CWS mingwport03 (1.11.420); FILE MERGED
2007/03/20 10:25:08 vg 1.11.420.3: RESYNC MERGED 1.12 1.13
Everything below this line will be added to the revision comment.
2006/11/07 16:57:40 vg 1.11.420.2: RESYNC: (1.11-1.12); FILE MERGED
2006/10/24 15:36:59 vg 1.11.420.1: #i53572# MinGW port
Diffstat (limited to 'solenv/inc/tg_obj.mk')
| -rw-r--r-- | solenv/inc/tg_obj.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/solenv/inc/tg_obj.mk b/solenv/inc/tg_obj.mk index 607793d99629..e446a0bdbbd3 100644 --- a/solenv/inc/tg_obj.mk +++ b/solenv/inc/tg_obj.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_obj.mk,v $ # -# $Revision: 1.13 $ +# $Revision: 1.14 $ # -# last change: $Author: obo $ $Date: 2007-01-25 12:56:07 $ +# last change: $Author: vg $ $Date: 2007-03-26 14:51:15 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -41,9 +41,7 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES) @echo Making: $@ .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" - $(ECHONL) $(foreach,i,$(OBJFILES:f) $(ROBJ)$/$(i)) >> $@ - @$(TYPE) $@ | tr -d ï\n\rï > $@ - @$(ECHONL) >> $@ + $(ECHONL) $(foreach,i,$(OBJFILES:f) $(ROBJ)$/$(i)) > $@ .ELSE # "$(COM)"=="GCC" .IF "$(LIBTARGET)"!="NO" @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) |