[Libreoffice-commits] .: 2 commits - i18npool/source
Christian Lohmaier
cloph at kemper.freedesktop.org
Mon Jun 13 09:36:05 PDT 2011
i18npool/source/breakiterator/data/makefile.mk | 22 +++-----
i18npool/source/breakiterator/makefile.mk | 63 ++++++++++++-------------
2 files changed, 40 insertions(+), 45 deletions(-)
New commits:
commit 9c533b520fab3c56c2e1741746ceb9dc1590b2c4
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Mon Jun 13 18:33:30 2011 +0200
fix broken makefile that just happened to work because errors cancelled each other
get rid of unnecessary %-rule (and the "more than one prerequisite" warning),
get rid of the unneded $/ escapes,
get rid of obsolete WRAPCMD
diff --git a/i18npool/source/breakiterator/makefile.mk b/i18npool/source/breakiterator/makefile.mk
index fc6561c..434fdc9 100644
--- a/i18npool/source/breakiterator/makefile.mk
+++ b/i18npool/source/breakiterator/makefile.mk
@@ -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/) >> $@
commit d58835ec234510d2b51eaf93dc2ebb57bdeef1d7
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Mon Jun 13 18:31:17 2011 +0200
get rid of unneded dependency (already in prj/build.lst)
furthermore the dependency did no longer match the command that was
actually used in the rule
also get rid of the unnecessary $/ escapes
diff --git a/i18npool/source/breakiterator/data/makefile.mk b/i18npool/source/breakiterator/data/makefile.mk
index 4dd2c1a..81bbbbd 100644
--- a/i18npool/source/breakiterator/data/makefile.mk
+++ b/i18npool/source/breakiterator/data/makefile.mk
@@ -24,7 +24,7 @@
# for a copy of the LGPLv3 License.
#
#************************************************************************
-PRJ=..$/..$/..
+PRJ=../../..
PRJNAME=i18npool
TARGET=dict
@@ -46,13 +46,13 @@ SHL1TARGET=dict_ja
SHL1IMPLIB=i$(SHL1TARGET)
SHL1VERSIONMAP=$(TARGET).map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+SHL1DEF=$(MISC)/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)
SHL1OBJS= \
- $(SLO)$/dict_ja.obj
+ $(SLO)/dict_ja.obj
-LIB1TARGET= $(SLB)$/$(SHL1TARGET).lib
+LIB1TARGET= $(SLB)/$(SHL1TARGET).lib
LIB1OBJFILES=$(SHL1OBJS)
# Chinese dictionary
@@ -60,13 +60,13 @@ SHL2TARGET=dict_zh
SHL2IMPLIB=i$(SHL2TARGET)
SHL2VERSIONMAP=$(TARGET).map
-SHL2DEF=$(MISC)$/$(SHL2TARGET).def
+SHL2DEF=$(MISC)/$(SHL2TARGET).def
DEF2NAME=$(SHL2TARGET)
SHL2OBJS= \
- $(SLO)$/dict_zh.obj
+ $(SLO)/dict_zh.obj
-LIB2TARGET= $(SLB)$/$(SHL2TARGET).lib
+LIB2TARGET= $(SLB)/$(SHL2TARGET).lib
LIB2OBJFILES=$(SHL2OBJS)
DEPOBJFILES= \
@@ -76,9 +76,5 @@ DEPOBJFILES= \
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-$(MISC)$/dict_%.cxx : %.dic
- $(AUGMENT_LIBRARY_PATH) $(OUT_FOR_BUILD)$/bin$/gendict $< $@
-
-# ugly - is this dependency really required here?
-$(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gendict$(EXECPOST)
-
+$(MISC)/dict_%.cxx : %.dic
+ $(AUGMENT_LIBRARY_PATH) $(OUT_FOR_BUILD)/bin/gendict $< $@
More information about the Libreoffice-commits
mailing list