diff --git a/icu4c/source/config/mh-cygwin-msvc b/icu4c/source/config/mh-cygwin-msvc index d2d5b6c5e10..0ecfbf2f9f8 100644 --- a/icu4c/source/config/mh-cygwin-msvc +++ b/icu4c/source/config/mh-cygwin-msvc @@ -3,7 +3,7 @@ ## Copyright (c) 2001, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-cygwin-msvc,v 1.3 2003/03/19 01:56:29 grhoten-oss Exp $ +## $Id: mh-cygwin-msvc,v 1.4 2003/03/21 01:12:29 grhoten-oss Exp $ ## Commands to generate dependency files GEN_DEPS.c= : @@ -105,19 +105,19 @@ LIBUSTDIO= $(top_builddir)/extra/ustdio/libustdio$(ICULIBSUFFIX)$(SO_TARGET_VERS @rc.exe /fo$@ $< ## Versioned target for a shared library. -FINAL_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR)$(ICULIBSUFFIX).$(SO) +FINAL_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO) MIDDLE_SO_TARGET=$(SO_TARGET) ## Versioned import library names. IMPORT_LIB = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(IMPORT_LIB_EXT) IMPORT_STUBDATA_LIB = $(IMPORT_LIB) -FINAL_IMPORT_LIB = $(LIBICU)$(TARGET_STUBNAME)$(SO_TARGET_VERSION_MAJOR)$(ICULIBSUFFIX)$(IMPORT_LIB_EXT) +FINAL_IMPORT_LIB = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR)$(IMPORT_LIB_EXT) FINAL_IMPORT_STUBDATA_LIB = $(FINAL_IMPORT_LIB) ## Versioned libraries rules -#%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION)$(ICULIBSUFFIX).$(SO) +#%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO) # $(RM) $@ && cp $< $@ -%.$(SO): %$(SO_TARGET_VERSION_MAJOR)$(ICULIBSUFFIX).$(SO) +%.$(SO): %$(SO_TARGET_VERSION_MAJOR).$(SO) $(RM) $@ && ln -s $< $@ ## Bind internal references diff --git a/icu4c/source/config/mh-os390 b/icu4c/source/config/mh-os390 index aa8bd829a76..e3faf9a13fc 100644 --- a/icu4c/source/config/mh-os390 +++ b/icu4c/source/config/mh-os390 @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2001, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-os390,v 1.46 2003/03/19 01:56:29 grhoten-oss Exp $ +## $Id: mh-os390,v 1.47 2003/03/21 01:12:29 grhoten-oss Exp $ ################################################################### # IMPORTANT NOTE # @@ -73,17 +73,17 @@ LD_RPATH= -I LDLIBRARYPATH_ENVVAR = LIBPATH ## An import library (a.k.a. sidedeck) is needed for z/OS and MSVC -IMPORT_LIB_EXT = .lib +IMPORT_LIB_EXT = .x ## Versioned target for a shared library. -FINAL_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION)$(ICULIBSUFFIX).$(SO) -MIDDLE_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR)$(ICULIBSUFFIX).$(SO) +FINAL_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO) +MIDDLE_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO) ## Versioned import library names. IMPORT_LIB = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(IMPORT_LIB_EXT) IMPORT_STUBDATA_LIB = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX)$(IMPORT_LIB_EXT) -FINAL_IMPORT_LIB = $(LIBICU)$(TARGET_STUBNAME)$(SO_TARGET_VERSION_MAJOR)$(ICULIBSUFFIX)$(IMPORT_LIB_EXT) -FINAL_IMPORT_STUBDATA_LIB = $(LIBICU)$(TARGET_STUBNAME)$(SO_TARGET_VERSION)$(ICULIBSUFFIX)$(STUB_SUFFIX)$(IMPORT_LIB_EXT) +FINAL_IMPORT_LIB = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR)$(IMPORT_LIB_EXT) +FINAL_IMPORT_STUBDATA_LIB = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX)$(SO_TARGET_VERSION)$(IMPORT_LIB_EXT) ## Shared object suffix (switch to dll for shared library build) SO = dll @@ -158,9 +158,9 @@ LIBUSTDIO= $(top_builddir)/extra/ustdio/libustdio$(ICULIBSUFFIX)$(SO_TARGET_VERS @$(SHELL) -ec '$(GEN_DEPS.cc) -f $*.u $< > /dev/null 2>&1' ## Versioned libraries rules -%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION)$(ICULIBSUFFIX).$(SO) - $(RM) $@ && ln -s $*$(SO_TARGET_VERSION)$(ICULIBSUFFIX).$(SO) $@ -%.$(SO): %$(SO_TARGET_VERSION)$(ICULIBSUFFIX).$(SO) - $(RM) $@ && ln -s $*$(SO_TARGET_VERSION)$(ICULIBSUFFIX).$(SO) $@ +%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO) + $(RM) $@ && ln -s $*$(SO_TARGET_VERSION).$(SO) $@ +%.$(SO): %$(SO_TARGET_VERSION).$(SO) + $(RM) $@ && ln -s $*$(SO_TARGET_VERSION).$(SO) $@ ## End 390-specific setup