diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-16 13:32:58 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-16 13:32:58 +0000 |
| commit | b887928c7cbf9014e4f19628ab090f560a104733 (patch) | |
| tree | d8f17a27c8c4f5f8706c2227a82486ce69ba4d84 /i18npool | |
| parent | 3fdc9727bb36d83af36a6dd7199a0caaeffdeaf5 (diff) | |
INTEGRATION: CWS ause085 (1.5.2); FILE MERGED
2007/11/26 15:00:04 hjs 1.5.2.1: #i83981# makefile fixes
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/collator/data/makefile.mk | 13 | ||||
| -rw-r--r-- | i18npool/source/indexentry/data/makefile.mk | 6 |
2 files changed, 8 insertions, 11 deletions
diff --git a/i18npool/source/collator/data/makefile.mk b/i18npool/source/collator/data/makefile.mk index 64de0deff019..cc3474385f8a 100644 --- a/i18npool/source/collator/data/makefile.mk +++ b/i18npool/source/collator/data/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: rt $ $Date: 2007-11-06 15:51:12 $ +# last change: $Author: ihi $ $Date: 2008-01-16 14:32:34 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -36,7 +36,6 @@ PRJ=..$/..$/.. PRJNAME=i18npool TARGET=collator_data -LIBTARGET=NO # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk @@ -59,10 +58,8 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) DATA_TXTFILES:=$(shell @ls ./*.txt) -SHL1OBJS=$(subst,./,$(SLO)$/collator_ $(DATA_TXTFILES:s/.txt/.obj/)) - -LIB1TARGET= $(SLB)$/$(SHL1TARGET).lib -LIB1OBJFILES=$(SHL1OBJS) +SLOFILES=$(subst,./,$(SLO)$/collator_ $(DATA_TXTFILES:s/.txt/.obj/)) +SHL1OBJS=$(SLOFILES) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk @@ -71,5 +68,5 @@ $(MISC)$/collator_%.cxx : %.txt $(BIN)$/gencoll_rule $< $@ $* # ugly - is this dependency really required here? -$(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gencoll_rule +$(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gencoll_rule$(EXECPOST) diff --git a/i18npool/source/indexentry/data/makefile.mk b/i18npool/source/indexentry/data/makefile.mk index 14f50a8e3c84..92544d0eaf01 100644 --- a/i18npool/source/indexentry/data/makefile.mk +++ b/i18npool/source/indexentry/data/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: rt $ $Date: 2007-11-06 15:51:34 $ +# last change: $Author: ihi $ $Date: 2008-01-16 14:32:58 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -71,5 +71,5 @@ $(MISC)$/%.cxx : %.txt $(BIN)$/genindex_data $< $@ $* # ugly - is this dependency really required here? -$(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/genindex_data +$(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/genindex_data$(EXECPOST) |