diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 11:57:52 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 11:57:52 +0000 |
| commit | 0a9165c52653c10dfcd82a06d74b09d749e4d932 (patch) | |
| tree | a72fd76ef3add51de717a45b089f5fddca521398 /solenv/inc/tg_yxx.mk | |
| parent | 5ae36f2057cd7cda24c79d86dd98a934025584df (diff) | |
INTEGRATION: CWS ause069 (1.12.2); FILE MERGED
2006/10/11 12:36:27 hjs 1.12.2.1: #i70359#: removing + sign in targets; adding to tool macro if required
Diffstat (limited to 'solenv/inc/tg_yxx.mk')
| -rw-r--r-- | solenv/inc/tg_yxx.mk | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/solenv/inc/tg_yxx.mk b/solenv/inc/tg_yxx.mk index 0d8a48461f95..9b9e3992aec7 100644 --- a/solenv/inc/tg_yxx.mk +++ b/solenv/inc/tg_yxx.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_yxx.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: kz $ $Date: 2006-10-05 10:42:09 $ +# last change: $Author: obo $ $Date: 2007-01-25 12:57:52 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -38,27 +38,27 @@ $(MISC)$/%.cxx : %.y @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="UNX" || "$(USE_SHELL)" != "4nt" - +tr -d "\015" < $< > $(MISC)$/stripped_$< + tr -d "\015" < $< > $(MISC)$/stripped_$< .ELSE - +cat $< > $(MISC)$/stripped_$< + cat $< > $(MISC)$/stripped_$< .ENDIF $(BISON) $(YACCFLAGS) -o $(YACCTARGET) $(MISC)$/stripped_$< # removing -f switch - avoid getting nothing when copying a file to itself - +-$(COPY:s/-f//) $@.h $(INCCOM)$/$(@:b).hxx >& $(NULLDEV) - +-$(COPY:s/-f//) $(@:d)$/$(@:b).hxx $(INCCOM)$/$(@:b).hxx >& $(NULLDEV) - +$(TYPE) $(INCCOM)$/$(@:b).hxx >& $(NULLDEV) + -$(COPY:s/-f//) $@.h $(INCCOM)$/$(@:b).hxx >& $(NULLDEV) + -$(COPY:s/-f//) $(@:d)$/$(@:b).hxx $(INCCOM)$/$(@:b).hxx >& $(NULLDEV) + $(TYPE) $(INCCOM)$/$(@:b).hxx >& $(NULLDEV) $(INCCOM)$/yy%.cxx : %.y @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="UNX" || "$(USE_SHELL)" != "4nt" - +tr -d "\015" < $< > $(MISC)$/stripped_$< + tr -d "\015" < $< > $(MISC)$/stripped_$< .ELSE - +cat $< > $(MISC)$/stripped_$< + cat $< > $(MISC)$/stripped_$< .ENDIF $(BISON) $(YACCFLAGS) -o $(YACCTARGET) $(MISC)$/stripped_$< # removing -f switch - avoid getting nothing when copying a file to itself - @+-$(COPY:s/-f//) $@.h $(INCCOM)$/$(@:b).hxx >& $(NULLDEV) - @+-$(COPY:s/-f//) $(@:d)$/$(@:b).hxx $(INCCOM)$/$(@:b).hxx >& $(NULLDEV) - +$(TYPE) $(INCCOM)$/$(@:b).hxx >& $(NULLDEV) + @-$(COPY:s/-f//) $@.h $(INCCOM)$/$(@:b).hxx >& $(NULLDEV) + @-$(COPY:s/-f//) $(@:d)$/$(@:b).hxx $(INCCOM)$/$(@:b).hxx >& $(NULLDEV) + $(TYPE) $(INCCOM)$/$(@:b).hxx >& $(NULLDEV) |