strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix broken makefile that just happened to work because errors cancelled each other

Browse source 
get rid of unnecessary %-rule (and the "more than one prerequisite" warning),
get rid of the unneded $/ escapes,
get rid of obsolete WRAPCMD
This commit is contained in:
Christian Lohmaier 2011-06-13 18:33:30 +02:00
parent 433dc982f0
commit 67f9851d4c
1 changed files with 31 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
i18npool/source/breakiterator/makefile.mk
View file

@ -24,7 +24,7 @@
# for a copy of the LGPLv3 License.
#
#************************************************************************/
PRJ=..$/..
PRJ=../..
PRJNAME=i18npool
TARGET=breakiterator
@ -41,28 +41,28 @@ ENABLE_EXCEPTIONS=TRUE
MY_BRK_TXTFILES:=$(shell @ls data/*.txt)
# insert "OpenOffice" as icu package name in front of the name of each rule file for searching on application provided data
MY_BRK_BRKFILES:=$(subst,data/,$(MISC)$/ $(MY_BRK_TXTFILES:s/.txt/.brk/))
MY_BRK_BRKFILES:=$(subst,data/,$(MISC)/ $(MY_BRK_TXTFILES:s/.txt/.brk/))
# OpenOffice_dat.c is a generated file from the rule file list by gencmn
MY_MISC_CXXFILES := \
$(MISC)$/OpenOffice_dat.c \
$(MISC)/OpenOffice_dat.c \
$(MY_BRK_BRKFILES:s/.brk/_brk.c/)
SLOFILES= \
$(SLO)$/breakiteratorImpl.obj \
$(SLO)$/breakiterator_cjk.obj \
$(SLO)$/breakiterator_ctl.obj \
$(SLO)$/breakiterator_th.obj \
$(SLO)$/breakiterator_unicode.obj \
$(SLO)$/xdictionary.obj \
$(subst,$(MISC)$/,$(SLO)$/ $(MY_MISC_CXXFILES:s/.c/.obj/))
$(SLO)/breakiteratorImpl.obj \
$(SLO)/breakiterator_cjk.obj \
$(SLO)/breakiterator_ctl.obj \
$(SLO)/breakiterator_th.obj \
$(SLO)/breakiterator_unicode.obj \
$(SLO)/xdictionary.obj \
$(subst,$(MISC)/,$(SLO)/ $(MY_MISC_CXXFILES:s/.c/.obj/))
OBJFILES = $(OBJ)$/gendict.obj
OBJFILES = $(OBJ)/gendict.obj
APP1TARGET = gendict
APP1RPATH = NONE
DEPOBJFILES = $(OBJ)$/gendict.obj
DEPOBJFILES = $(OBJ)/gendict.obj
APP1OBJS = $(DEPOBJFILES)
APP1STDLIBS = $(SALLIB)
@ -74,37 +74,36 @@ GENCMN:=$(SYSTEM_GENCMN)
GENBRK:=$(SYSTEM_GENBRK)
GENCCODE:=$(SYSTEM_GENCCODE)
.ELSE
GENCMN:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/gencmn
GENBRK:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/genbrk
GENCCODE:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/genccode
GENCMN:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/gencmn
GENBRK:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/genbrk
GENCCODE:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/genccode
.ENDIF
.INCLUDE .IGNORE : icuversion.mk
$(MISC)$/%.txt : data/%.txt
.INCLUDE : target.mk
$(MISC)/%.txt : data/%.txt
# fdo#31271 ")" reclassified in more recent ICU/Unicode Standards
.IF "$(ICU_MAJOR)" >= "5" || ("$(ICU_MAJOR)" == "4" && "$(ICU_MINOR)" >= "4")
$(SED) "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@
$(SED) "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@
.ELSE
$(COPY) $< $@
$(COPY) $< $@
.ENDIF
$(MISC)$/%.brk : $(MISC)/%.txt
$(WRAPCMD) $(GENBRK) -r $< -o $(MISC)$/$*.brk
$(MISC)/%.brk : $(MISC)/%.txt
$(GENBRK) -r $< -o $(MISC)/$*.brk
$(MISC)$/%_brk.c : $(MISC)$/%.brk
$(WRAPCMD) $(GENCCODE) -n OpenOffice -d $(MISC)$ $(MISC)$/$*.brk
$(MISC)/%_brk.c : $(MISC)/%.brk
$(GENCCODE) -n OpenOffice -d $(MISC)$ $(MISC)/$*.brk
# '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.
# so the output (OpenOffice_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_%.c : $(MY_BRK_BRKFILES:s/.brk/_brk.c/)
$(WRAPCMD) $(GENCMN) -n OpenOffice -t tmp -S -d $(MISC) O $(mktmp $(subst,$(MISC)$/, $(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/) >> $@
.INCLUDE : target.mk
$(MISC)/OpenOffice_dat.c : $(MY_BRK_BRKFILES:s/.brk/_brk.c/)
$(GENCMN) -n OpenOffice -t tmp -S -d $(MISC) O $(mktmp $(subst,$(MISC)/, $(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/) >> $@