diff options
author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 12:53:34 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 12:53:34 +0000 |
commit | 255074b7d9c9ee7d6274301832095af4ba13b19e (patch) | |
tree | 0b9f186e9086f3354b4901b190d7ae7a9f42c82b /idlc | |
parent | fc1f06961a336d7cc3d11844025bf20bc3cd3e78 (diff) |
INTEGRATION: CWS ause069 (1.13.24); FILE MERGED
2006/12/01 17:37:53 hjs 1.13.24.1: #i70359# remove forced shell calls
Diffstat (limited to 'idlc')
-rw-r--r-- | idlc/source/makefile.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/idlc/source/makefile.mk b/idlc/source/makefile.mk index 2494eecd7a29..c5eb81b445e4 100644 --- a/idlc/source/makefile.mk +++ b/idlc/source/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.13 $ +# $Revision: 1.14 $ # -# last change: $Author: hr $ $Date: 2006-06-20 03:49:29 $ +# last change: $Author: obo $ $Date: 2007-01-25 13:53:34 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -123,13 +123,13 @@ YACCFLAGS+=-v $(MISC)$/stripped_scanner.ll : scanner.ll .IF "$(GUI)"=="UNX" || "$(USE_SHELL)" != "4nt" - +tr -d "\015" < scanner.ll > $(MISC)$/stripped_scanner.ll + tr -d "\015" < scanner.ll > $(MISC)$/stripped_scanner.ll .ELSE - +cat scanner.ll > $(MISC)$/stripped_scanner.ll + cat scanner.ll > $(MISC)$/stripped_scanner.ll .ENDIF $(MISC)$/scanner.cxx: $(MISC)$/stripped_scanner.ll - +flex -o$(MISC)$/scanner.cxx $(MISC)$/stripped_scanner.ll + flex -o$(MISC)$/scanner.cxx $(MISC)$/stripped_scanner.ll $(OBJ)$/wrap_parser.obj: $(MISC)$/parser.cxx $(OBJ)$/wrap_scanner.obj: $(MISC)$/scanner.cxx |