Kaydet (Commit) b0ed6d30 authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

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
üst e7431b2d
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
# #
# $RCSfile: makefile.mk,v $ # $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 Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # the terms of GNU Lesser General Public License Version 2.1.
...@@ -301,7 +301,8 @@ SHL2OBJS= \ ...@@ -301,7 +301,8 @@ SHL2OBJS= \
$(SLO)$/localedata_es_PY.obj \ $(SLO)$/localedata_es_PY.obj \
$(SLO)$/localedata_es_SV.obj \ $(SLO)$/localedata_es_SV.obj \
$(SLO)$/localedata_es_UY.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 LIB2TARGET= $(SLB)$/$(SHL2TARGET).lib
LIB2OBJFILES=$(SHL2OBJS) LIB2OBJFILES=$(SHL2OBJS)
...@@ -317,7 +318,7 @@ SHL3VERSIONMAP=localedata_euro.map ...@@ -317,7 +318,7 @@ SHL3VERSIONMAP=localedata_euro.map
SHL3DEF=$(MISC)$/$(SHL3TARGET).def SHL3DEF=$(MISC)$/$(SHL3TARGET).def
DEF3NAME=$(SHL3TARGET) DEF3NAME=$(SHL3TARGET)
SHL3STDLIBS= $(LINK_LOCALEDATA_EN_LIB) $(LINK_LOCALEDATA_ES_LIB) SHL3STDLIBS= $(LINK_LOCALEDATA_EN_LIB)
SHL3DEPN=$(SHL1TARGETN) $(SHL2TARGETN) SHL3DEPN=$(SHL1TARGETN) $(SHL2TARGETN)
SHL3OBJS= \ SHL3OBJS= \
$(SLO)$/localedata_be_BY.obj \ $(SLO)$/localedata_be_BY.obj \
...@@ -348,7 +349,6 @@ SHL3OBJS= \ ...@@ -348,7 +349,6 @@ SHL3OBJS= \
$(SLO)$/localedata_fur_IT.obj \ $(SLO)$/localedata_fur_IT.obj \
$(SLO)$/localedata_fy_NL.obj \ $(SLO)$/localedata_fy_NL.obj \
$(SLO)$/localedata_ga_IE.obj \ $(SLO)$/localedata_ga_IE.obj \
$(SLO)$/localedata_gl_ES.obj \
$(SLO)$/localedata_gsc_FR.obj \ $(SLO)$/localedata_gsc_FR.obj \
$(SLO)$/localedata_hr_HR.obj \ $(SLO)$/localedata_hr_HR.obj \
$(SLO)$/localedata_is_IS.obj \ $(SLO)$/localedata_is_IS.obj \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment