diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:42:28 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:42:28 +0000 |
| commit | fb9ef8e4d1cddc86162ad43dcaf98f62a0a98996 (patch) | |
| tree | 356577a4847eecf7c22fe4f5f2a66c19c2fe034f /i18npool | |
| parent | fa9256d2a310e171f86fa47175fca1c4e2eb2e16 (diff) | |
INTEGRATION: CWS warnings01 (1.9.2); FILE MERGED
2006/05/26 13:43:11 sb 1.9.2.3: #i53898# Made code warning-free and/or compile at all after resync to SRC680m170.
2006/04/20 15:23:15 sb 1.9.2.2: #i53898# Made code compile and/or warning-free again after resync to SRC680m162.
2006/03/08 13:19:08 nn 1.9.2.1: #i53898# warning-free code
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/breakiterator/makefile.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/i18npool/source/breakiterator/makefile.mk b/i18npool/source/breakiterator/makefile.mk index cb3fdeaaf326..9ea58abbaa29 100644 --- a/i18npool/source/breakiterator/makefile.mk +++ b/i18npool/source/breakiterator/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: kz $ $Date: 2005-11-01 14:52:19 $ +# last change: $Author: hr $ $Date: 2006-06-20 04:42:28 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -79,8 +79,15 @@ APP1STDLIBS = $(SALLIB) .INCLUDE : target.mk # 'gencmn', 'genbrk' and 'genccode' are tools generated and delivered by icu project to process icu breakiterator rules. +# The output of gencmn generates warnings under Windows. We want to minimize the patches to external tools, +# so the output (OpenOffice_icu_dat.c) is changed here to include a pragma to disable the warnings. +# Output of gencmn is redirected to OpenOffice_icu_tmp.c with the -t switch. $(MISC)$/OpenOffice_icu_dat.c : $(MY_BRK_BRKFILES) - +$(WRAPCMD) $(SOLARBINDIR)$/gencmn -e OpenOffice_icu -n OpenOffice_icu -S -d $(MISC) O $(mktmp $(MY_BRK_BRKFILES:t"\n")) + +$(WRAPCMD) $(SOLARBINDIR)$/gencmn -e OpenOffice_icu -n OpenOffice_icu -t tmp -S -d $(MISC) O $(mktmp $(MY_BRK_BRKFILES:t"\n")) + +echo $(USQ)#ifdef _MSC_VER$(USQ) > $@ + +echo $(USQ)#pragma warning( disable : 4229 4668 )$(USQ) >> $@ + +echo $(USQ)#endif$(USQ) >> $@ + +$(TYPE) $(@:s/_dat/_tmp/) >> $@ $(MISC)$/OpenOffice_%.brk : data/%.txt +$(WRAPCMD) $(SOLARBINDIR)$/genbrk -r $< -o $(MISC)$/OpenOffice_$*.brk $(MISC)$/%_brk.c : $(MISC)$/%.brk |