summaryrefslogtreecommitdiffstats
path: root/i18npool/util
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2007-07-18 06:10:33 +0000
committerOliver Bolte <obo@openoffice.org>2007-07-18 06:10:33 +0000
commit83b32ddee48cfeeb0f19250132d6c470ae91f6da (patch)
treef2e2c2f57f3f07618652f2e458a8d0291af21a6d /i18npool/util
parentINTEGRATION: CWS localefallback (1.16.98); FILE MERGED (diff)
downloadcore-83b32ddee48cfeeb0f19250132d6c470ae91f6da.tar.gz
core-83b32ddee48cfeeb0f19250132d6c470ae91f6da.zip
INTEGRATION: CWS localefallback (1.21.34); FILE MERGED
2007/07/11 14:00:38 er 1.21.34.2: need version.mk (wonder how that linked in a non-pro environment?! ?) and have some dependency on i18nisolang*.lib 2007/07/10 18:54:55 er 1.21.34.1: #i73506# use getFallbackLocale() instead of keeping a separate list
Diffstat (limited to 'i18npool/util')
-rw-r--r--i18npool/util/makefile.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/i18npool/util/makefile.mk b/i18npool/util/makefile.mk
index eac373ee7211..c42b89672251 100644
--- a/i18npool/util/makefile.mk
+++ b/i18npool/util/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.21 $
+# $Revision: 1.22 $
#
-# last change: $Author: ihi $ $Date: 2006-12-19 18:05:56 $
+# last change: $Author: obo $ $Date: 2007-07-18 07:10:33 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -42,6 +42,7 @@ TARGET=i18npool.uno
.INCLUDE : settings.mk
DLLPRE =
+.INCLUDE : $(PRJ)/version.mk
# --- Allgemein ----------------------------------------------------------
@@ -65,7 +66,8 @@ SHL1TARGET= $(TARGET)
# WNT needs implib name even if there is none
SHL1IMPLIB= i$(SHL1TARGET)
-SHL1DEPN= makefile.mk
+SHL1DEPN= makefile.mk \
+ $(SLB)/i18nisolang$(ISOLANG_MAJOR)$(COMID).lib
SHL1VERSIONMAP=$(PRJNAME).map
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)
@@ -73,6 +75,7 @@ DEF1NAME=$(SHL1TARGET)
SHL1LIBS=$(LIB1TARGET)
SHL1STDLIBS= \
$(I18NUTILLIB) \
+ $(I18NISOLANGLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALLIB) \