ICU-1891 Try to make dual library support optional for z/OS (os/390)

X-SVN-Rev: 8652
This commit is contained in:
George Rhoten 2002-05-21 22:41:42 +00:00
parent 4b1124162c
commit dad490f932
3 changed files with 17 additions and 15 deletions
icu4c/source

View file

@ -3,7 +3,7 @@
## Copyright (c) 1999-2001, International Business Machines Corporation and
## others. All Rights Reserved.
##
## $Id: mh-os390,v 1.35 2002/05/09 21:33:50 grhoten-oss Exp $
## $Id: mh-os390,v 1.36 2002/05/21 22:41:42 grhoten-oss Exp $
###################################################################
# IMPORTANT NOTE #
@ -63,7 +63,7 @@ LD_RPATH= -I
LDLIBRARYPATH_ENVVAR = LIBPATH
## Versioned target for a shared library.
FINAL_SO_TARGET = $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO)
FINAL_SO_TARGET = $(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO)
MIDDLE_SO_TARGET = $(basename $(SO_TARGET).$(SO))
## Shared object suffix (switch to dll for shared library build)
@ -71,23 +71,25 @@ SO = dll
## Non-shared intermediate object suffix
STATIC_O = o
ifeq ($(OS390BATCH),1)
ifeq ($(OS390_STUBDATA),1)
## Suffix of the subset data library for batch mode
BATCH_STUB_SUFFIX=_390
STUB_SUFFIX=_390
endif
ifeq ($(OS390BATCH),1)
BATCH_STUB_TARGET= "//'${LOADMOD}(IXMI${SO_TARGET_VERSION_MAJOR}D1)'"
BATCH_LIBICUUC= "//'${LOADEXP}(IXMI${SO_TARGET_VERSION_MAJOR}UC)'"
BATCH_LIBICUDT= "//'${LOADEXP}(IXMI${SO_TARGET_VERSION_MAJOR}D1)'"
endif
## Link commands to link to ICU libs
LIBICUDT= $(top_builddir)/stubdata/lib$(ICUDATA_NAME)$(ICULIBSUFFIX)$(BATCH_STUB_SUFFIX).x
LIBICUUC= $(top_builddir)/common/lib$(ICUPREFIX)uc$(ICULIBSUFFIX).$(SO_TARGET_VERSION).x
LIBICUI18N= $(top_builddir)/i18n/lib$(ICUPREFIX)i18n$(ICULIBSUFFIX).$(SO_TARGET_VERSION).x
LIBICULE= $(top_builddir)/layout/lib$(ICUPREFIX)le$(ICULIBSUFFIX).$(SO_TARGET_VERSION).x
LIBCTESTFW= $(top_builddir)/tools/ctestfw/lib$(ICUPREFIX)ctestfw$(ICULIBSUFFIX).$(SO_TARGET_VERSION).x
LIBICUTOOLUTIL= $(top_builddir)/tools/toolutil/lib$(ICUPREFIX)toolutil$(ICULIBSUFFIX).$(SO_TARGET_VERSION).x
LIBUSTDIO= $(top_builddir)/extra/ustdio/libustdio$(ICULIBSUFFIX).$(SO_TARGET_VERSION).x
LIBICUDT= $(top_builddir)/stubdata/lib$(ICUPREFIX)data$(ICULIBSUFFIX)$(STUB_SUFFIX).x
LIBICUUC= $(top_builddir)/common/lib$(ICUPREFIX)uc$(ICULIBSUFFIX)$(SO_TARGET_VERSION).x
LIBICUI18N= $(top_builddir)/i18n/lib$(ICUPREFIX)i18n$(ICULIBSUFFIX)$(SO_TARGET_VERSION).x
LIBICULE= $(top_builddir)/layout/lib$(ICUPREFIX)le$(ICULIBSUFFIX)$(SO_TARGET_VERSION).x
LIBCTESTFW= $(top_builddir)/tools/ctestfw/lib$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)$(SO_TARGET_VERSION).x
LIBICUTOOLUTIL= $(top_builddir)/tools/toolutil/lib$(ICUPREFIX)toolutil$(ICULIBSUFFIX)$(SO_TARGET_VERSION).x
LIBUSTDIO= $(top_builddir)/extra/ustdio/libustdio$(ICULIBSUFFIX)$(SO_TARGET_VERSION).x
## Special 390 rules

View file

@ -114,13 +114,13 @@ testdata: $(SPECIALTESTDATA)
#### 390 support
install390: build/icudata390.lst ./icupkg.inc
$(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(libdir)
cd build ; $(INVOKE) $(PKGDATA) -s $(BUILDDIR) -T $(BUILDDIR)/tmp3901 -p $(ICUDATA_NAME)$(BATCH_STUB_SUFFIX) -e $(ICUDATA_ENTRY_POINT) icudata390.lst -m dll $(PKGDATA_VERSIONING) -I $(DESTDIR)$(ICUPKGDATA_DIR)
cd build ; $(INVOKE) $(PKGDATA) -s $(BUILDDIR) -T $(BUILDDIR)/tmp3901 -p $(ICUDATA_NAME)$(STUB_SUFFIX) -e $(ICUDATA_ENTRY_POINT) icudata390.lst -m dll $(PKGDATA_VERSIONING) -I $(DESTDIR)$(ICUPKGDATA_DIR)
#### $(LIB_ICUDATA_NAME)$(BATCH_SUFFIX) is the subset data for batch mode
package390: build/icudata390.lst build/icudata.lst ./icupkg.inc
@$(MKINSTALLDIRS) tmp3901
cd build ; $(INVOKE) $(PKGDATA) -s $(BUILDDIR) -T $(BUILDDIR)/tmp3901 -p $(ICUDATA_NAME)$(BATCH_STUB_SUFFIX) -e $(ICUDATA_ENTRY_POINT) icudata390.lst -m dll
cp $(top_builddir)/data/$(LIB_ICUDATA_NAME)$(BATCH_STUB_SUFFIX).$(SO) $(top_builddir)/stubdata/$(LIB_ICUDATA_NAME)$(BATCH_STUB_SUFFIX).$(SO)
cd build ; $(INVOKE) $(PKGDATA) -s $(BUILDDIR) -T $(BUILDDIR)/tmp3901 -p $(ICUDATA_NAME)$(STUB_SUFFIX) -e $(ICUDATA_ENTRY_POINT) icudata390.lst -m dll
cp $(top_builddir)/data/$(LIB_ICUDATA_NAME)$(STUB_SUFFIX).$(SO) $(top_builddir)/stubdata/$(LIB_ICUDATA_NAME)$(STUB_SUFFIX).$(SO)
##### Define all the data files. the build rule that depends on them is below.

View file

@ -29,7 +29,7 @@ TARGET = lib$(ICUPREFIX)data$(ICULIBSUFFIX).a
endif
ifneq ($(ENABLE_SHARED),)
SO_TARGET = lib$(ICUPREFIX)data$(ICULIBSUFFIX).$(SO)
SO_TARGET = lib$(ICUPREFIX)data$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO)
ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(BATCH_STUB_TARGET)
endif