summaryrefslogtreecommitdiff
path: root/i18npool
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-01-28 15:36:46 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-01-28 15:36:46 +0000
commitb0ed6d30a727f128b748066270b0688e12768483 (patch)
treed090a913dfc81817761f76d8137cf330cc203715 /i18npool
parente7431b2d927618046f417963e6d21934a4a5cdbc (diff)
INTEGRATION: CWS locdat24 (1.43.14); FILE MERGED
2008/01/02 14:25:17 erack 1.43.14.1: #i84206# library dependencies: move gl_ES to liblocaledata_es so liblocaledata_euro doesn't need to be linked against liblocaledata_es anymore; patch by <kendy>, plus linker map files
Diffstat (limited to 'i18npool')
-rw-r--r--i18npool/source/localedata/data/makefile.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/i18npool/source/localedata/data/makefile.mk b/i18npool/source/localedata/data/makefile.mk
index 36f29d2818a8..33f20096219a 100644
--- a/i18npool/source/localedata/data/makefile.mk
+++ b/i18npool/source/localedata/data/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.44 $
+# $Revision: 1.45 $
#
-# last change: $Author: ihi $ $Date: 2008-01-16 14:33:21 $
+# last change: $Author: vg $ $Date: 2008-01-28 16:36:46 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -301,7 +301,8 @@ SHL2OBJS= \
$(SLO)$/localedata_es_PY.obj \
$(SLO)$/localedata_es_SV.obj \
$(SLO)$/localedata_es_UY.obj \
- $(SLO)$/localedata_es_VE.obj
+ $(SLO)$/localedata_es_VE.obj \
+ $(SLO)$/localedata_gl_ES.obj
LIB2TARGET= $(SLB)$/$(SHL2TARGET).lib
LIB2OBJFILES=$(SHL2OBJS)
@@ -317,7 +318,7 @@ SHL3VERSIONMAP=localedata_euro.map
SHL3DEF=$(MISC)$/$(SHL3TARGET).def
DEF3NAME=$(SHL3TARGET)
-SHL3STDLIBS= $(LINK_LOCALEDATA_EN_LIB) $(LINK_LOCALEDATA_ES_LIB)
+SHL3STDLIBS= $(LINK_LOCALEDATA_EN_LIB)
SHL3DEPN=$(SHL1TARGETN) $(SHL2TARGETN)
SHL3OBJS= \
$(SLO)$/localedata_be_BY.obj \
@@ -348,7 +349,6 @@ SHL3OBJS= \
$(SLO)$/localedata_fur_IT.obj \
$(SLO)$/localedata_fy_NL.obj \
$(SLO)$/localedata_ga_IE.obj \
- $(SLO)$/localedata_gl_ES.obj \
$(SLO)$/localedata_gsc_FR.obj \
$(SLO)$/localedata_hr_HR.obj \
$(SLO)$/localedata_is_IS.obj \