diff --git a/icu4c/source/config/mh-aix b/icu4c/source/config/mh-aix index 9fe45fea8e2..d322a1cfc14 100644 --- a/icu4c/source/config/mh-aix +++ b/icu4c/source/config/mh-aix @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-aix,v 1.22 2001/09/28 00:31:53 aheninger-oss Exp $ +## $Id: mh-aix,v 1.23 2001/10/03 23:32:11 grhoten-oss Exp $ ## Commands to generate dependency files GEN_DEPS.c= $(CC) -E -M $(DEFS) $(CPPFLAGS) @@ -34,35 +34,12 @@ LDLIBRARYPATH_ENVVAR = LIBPATH ## Compiler switch to embed a library name #LD_SONAME = -Wl, -## Versioned target for a shared library. -FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR) -MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR) - -### How ICU libraries are named... ex. $(LIBICU)uc$(SO) -## Prefix for the ICU library names -ICUPREFIX = icu -LIBICU = lib$(ICUPREFIX) ## Shared object suffix -#AIX does not have versioning support -#so we tag the major and minor versions to so SO= so ## Non-shared intermediate object suffix STATIC_O = o -RMV = rm -rf -## Platform commands to remove or move executable and library targets -INSTALL-S = $(INSTALL_PROGRAM) -INSTALL-L = $(INSTALL_DATA) - -## Link commands to link to ICU libs -LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -l$(ICUPREFIX)data -LIBICUUC= -brtl -L$(top_builddir)/common -l$(ICUPREFIX)uc $(LIBICUDT) -LIBICUI18N= -brtl -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n -LIBCTESTFW= -brtl -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw -LIBICUTOOLUTIL= -brtl -L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil -LIBUSTDIO= -brtl -L$(top_builddir)/extra/ustdio -lustdio - ## Special AIX rules ## Build archive from shared object @@ -103,9 +80,10 @@ LIBUSTDIO= -brtl -L$(top_builddir)/extra/ustdio -lustdio @$(SHELL) -ec '$(GEN_DEPS.cc) $< > /dev/null 2>&1' ## Versioned libraries rules -%.$(SO): - @echo "Generating symbolic link for $@ : $<" - @$(SHELL) -ec 'rm -f $@; ln -fs $(FINAL_SO_TARGET) $@' +%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) + $(RM) $@ && ln -s $< $@ +%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR) + $(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@ ## BIR - bind with internal references [so app data and icu data doesn't collide] BIR_LDFLAGS= -E$(NAME).map -bnoexpall diff --git a/icu4c/source/config/mh-aix-va b/icu4c/source/config/mh-aix-va index c15f08beaaf..cd7c5eafb52 100644 --- a/icu4c/source/config/mh-aix-va +++ b/icu4c/source/config/mh-aix-va @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-aix-va,v 1.11 2001/09/28 00:31:53 aheninger-oss Exp $ +## $Id: mh-aix-va,v 1.12 2001/10/03 23:32:11 grhoten-oss Exp $ ## Commands to generate dependency files GEN_DEPS.c= $(CC) -E -M $(DEFS) $(CPPFLAGS) @@ -31,33 +31,12 @@ LD_RPATH_PRE= ## Environment variable to set a runtime search path LDLIBRARYPATH_ENVVAR = LIBPATH -## Versioned target for a shared library. -FINAL_SO_TARGET = $(SO_TARGET) -MIDDLE_SO_TARGET = $(SO_TARGET) - -### How ICU libraries are named... ex. $(LIBICU)uc$(SO) -## Prefix for the ICU library names -ICUPREFIX = icu -LIBICU = lib$(ICUPREFIX) ## Shared object suffix ## AIX doesnot support versioning so we tag the version to name SO= so.$(SO_TARGET_VERSION_MAJOR) ## Non-shared intermediate object suffix STATIC_O = o -RMV = rm -rf -## Platform commands to remove or move executable and library targets -INSTALL-S = $(INSTALL_PROGRAM) -INSTALL-L = $(INSTALL_DATA) - - -## Link commands to link to ICU libs -LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc -LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n -LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw -LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil -LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio - ## Special AIX rules ## Build archive from shared object diff --git a/icu4c/source/config/mh-alpha-linux-cc b/icu4c/source/config/mh-alpha-linux-cc index 86c29494948..58d56dbde79 100644 --- a/icu4c/source/config/mh-alpha-linux-cc +++ b/icu4c/source/config/mh-alpha-linux-cc @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-alpha-linux-cc,v 1.3 2001/09/28 00:31:53 aheninger-oss Exp $ +## $Id: mh-alpha-linux-cc,v 1.4 2001/10/03 23:32:11 grhoten-oss Exp $ ## Commands to generate dependency files #GEN_DEPS.c= $(CC) $(DEFS) $(CPPFLAGS) -MD -c -msg_quiet @@ -24,8 +24,8 @@ COMPILE.cc= $(CXX) -D_LP64 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c -D__USE_STD_IOSTRE ## Commands to link -LINK.c= $(CC) -D_LP64 $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -LINK.cc= $(CXX) -D_LP64 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) +LINK.c= $(CC) -D_LP64 -call_shared $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) +LINK.cc= $(CXX) -D_LP64 -call_shared $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) ## Commands to make a shared library SHLIB.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared @@ -35,39 +35,14 @@ SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared LD_RPATH= $(LD_RPATH)$(LD_RPATH_PRE)path1 LD_RPATH_PRE= -Wl,-rpath, -## Environment variable to set a runtime search path -LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH - ## Compiler switch to embed a library name LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET) -## Versioned target for a shared library. -FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) -MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR) - -### How ICU libraries are named... ex. $(LIBICU)uc$(SO) -## Prefix for the ICU library names -ICUPREFIX = icu -LIBICU = lib$(ICUPREFIX) ## Shared object suffix SO = so ## Non-shared intermediate object suffix STATIC_O = ao -## Force removal [for make clean] -RMV = rm -rf -## Platform commands to remove or move executable and library targets -INSTALL-S = $(INSTALL_PROGRAM) -INSTALL-L = $(INSTALL_DATA) - -## Link commands to link to ICU libs -LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -l$(ICUPREFIX)data -LIBICUUC= -call_shared -L$(top_builddir)/common -l$(ICUPREFIX)uc $(LIBICUDT) -LIBICUI18N= -call_shared -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n -LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw -LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil -LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio - ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< diff --git a/icu4c/source/config/mh-alpha-linux-gcc b/icu4c/source/config/mh-alpha-linux-gcc index 51f279e1275..e437049daaa 100644 --- a/icu4c/source/config/mh-alpha-linux-gcc +++ b/icu4c/source/config/mh-alpha-linux-gcc @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-alpha-linux-gcc,v 1.3 2001/09/28 00:31:53 aheninger-oss Exp $ +## $Id: mh-alpha-linux-gcc,v 1.4 2001/10/03 23:32:11 grhoten-oss Exp $ ## Commands to generate dependency files GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) @@ -22,10 +22,6 @@ THREADSCPPFLAGS = -D_REENTRANT COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c -mieee COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c -mieee -## Commands to link -LINK.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -LINK.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) - ## Commands to make a shared library SHLIB.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared @@ -34,39 +30,14 @@ SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared LD_RPATH= LD_RPATH_PRE= -Wl,-rpath, -## Environment variable to set a runtime search path -LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH - ## Compiler switch to embed a library name LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET) -## Versioned target for a shared library. -FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) -MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR) - -### How ICU libraries are named... ex. $(LIBICU)uc$(SO) -## Prefix for the ICU library names -ICUPREFIX = icu -LIBICU = lib$(ICUPREFIX) ## Shared object suffix SO = so ## Non-shared intermediate object suffix STATIC_O = ao -## Force removal [for make clean] -RMV = rm -rf -## Platform commands to remove or move executable and library targets -INSTALL-S = $(INSTALL_PROGRAM) -INSTALL-L = $(INSTALL_DATA) - -## Link commands to link to ICU libs -LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -l$(ICUPREFIX)data -LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc $(LIBICUDT) -LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n -LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw -LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil -LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio - ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< diff --git a/icu4c/source/config/mh-bsd-gcc b/icu4c/source/config/mh-bsd-gcc index c8d17b82aa1..419eafe8880 100644 --- a/icu4c/source/config/mh-bsd-gcc +++ b/icu4c/source/config/mh-bsd-gcc @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-bsd-gcc,v 1.3 2001/09/28 00:31:53 aheninger-oss Exp $ +## $Id: mh-bsd-gcc,v 1.4 2001/10/03 23:32:11 grhoten-oss Exp $ ## Commands to generate dependency files GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) @@ -14,14 +14,6 @@ SHAREDLIBCFLAGS = -fPIC SHAREDLIBCXXFLAGS = -fPIC SHAREDLIBCPPFLAGS = -DPIC -## Commands to compile -COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c -COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c - -## Commands to link -LINK.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -LINK.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) - ## Commands to make a shared library SHLIB.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared @@ -30,39 +22,14 @@ SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared LD_RPATH= LD_RPATH_PRE= -Wl,-rpath, -## Environment variable to set a runtime search path -LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH - ## Compiler switch to embed a library name LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET) -## Versioned target for a shared library. -FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) -MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR) - -### How ICU libraries are named... ex. $(LIBICU)uc$(SO) -## Prefix for the ICU library names -ICUPREFIX = icu -LIBICU = lib$(ICUPREFIX) ## Shared object suffix SO= so ## Non-shared intermediate object suffix STATIC_O = ao -## Force removal [for make clean] -RMV = rm -rf -## Platform commands to remove or move executable and library targets -INSTALL-S = $(INSTALL_PROGRAM) -INSTALL-L = $(INSTALL_DATA) - -## Link commands to link to ICU libs -LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -l$(ICUPREFIX)data -LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc $(LIBICUDT) -LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n -LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw -LIBICUTOOLUTIL= -L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil -LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio - ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< diff --git a/icu4c/source/config/mh-cygwin b/icu4c/source/config/mh-cygwin index ca976bf0f6e..9760801a5e7 100644 --- a/icu4c/source/config/mh-cygwin +++ b/icu4c/source/config/mh-cygwin @@ -3,7 +3,7 @@ ## Copyright (c) 2001, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-cygwin,v 1.2 2001/09/28 00:31:53 aheninger-oss Exp $ +## $Id: mh-cygwin,v 1.3 2001/10/03 23:32:11 grhoten-oss Exp $ ## Commands to generate dependency files GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) @@ -18,14 +18,6 @@ SHAREDLIBCPPFLAGS = -DPIC LIBCPPFLAGS = -D_REENTRANT THREADSCPPFLAGS = -D_REENTRANT -## Commands to compile -COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c -COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c - -## Commands to link -LINK.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -LINK.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) - ## Commands to make a shared library SHLIB.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared @@ -34,38 +26,14 @@ SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared LD_RPATH= LD_RPATH_PRE= -Wl,-rpath, -## Environment variable to set a runtime search path -LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH - ## Compiler switch to embed a library name LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET) -## Versioned target for a shared library. -FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) -MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR) - -### How ICU libraries are named... ex. $(LIBICU)uc$(SO) -## Prefix for the ICU library names -ICUPREFIX = icu -LIBICU = lib$(ICUPREFIX) ## Shared object suffix SO = so ## Non-shared intermediate object suffix STATIC_O = ao -## Force removal [for make clean] -RMV = rm -rf -## Platform commands to remove or move executable and library targets -INSTALL-S = $(INSTALL_PROGRAM) -INSTALL-L = $(INSTALL_DATA) - -## Link commands to link to ICU libs -LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc -LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n -LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw -LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil -LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio - ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< diff --git a/icu4c/source/config/mh-darwin b/icu4c/source/config/mh-darwin index 3ddabe72017..45db59501f5 100644 --- a/icu4c/source/config/mh-darwin +++ b/icu4c/source/config/mh-darwin @@ -4,7 +4,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-darwin,v 1.17 2001/09/28 00:31:53 aheninger-oss Exp $ +## $Id: mh-darwin,v 1.18 2001/10/03 23:32:11 grhoten-oss Exp $ ## Flags for position independent code SHAREDLIBCFLAGS = -dynamic @@ -19,10 +19,6 @@ GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -fno-common -c COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -fno-common -c -## Commands to link -LINK.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -LINK.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) - ## Commands to make a shared library SHLIB.c= $(CC) -dynamiclib -dynamic $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -install_name $(DESTDIR)$(libdir)/$(TARGET) SHLIB.cc= $(CXX) -dynamiclib -dynamic $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -install_name $(DESTDIR)$(libdir)/$(TARGET) @@ -31,35 +27,15 @@ SHLIB.cc= $(CXX) -dynamiclib -dynamic $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) LD_RPATH= -L LD_RPATH_PRE= -## Environment variable to set a runtime search path -LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH - ## Versioned target for a shared library. FINAL_SO_TARGET = $(SO_TARGET) MIDDLE_SO_TARGET = -### How ICU libraries are named... ex. $(LIBICU)uc$(SO) -## Prefix for the ICU library names -ICUPREFIX = icu -LIBICU = lib$(ICUPREFIX) ## Shared object suffix SO= dylib ## Non-shared intermediate object suffix STATIC_O = ao -## Force removal [for make clean] -RMV = rm -rf -## Platform commands to remove or move executable and library targets -INSTALL-S = $(INSTALL_PROGRAM) -INSTALL-L = $(INSTALL_DATA) - -## Link commands to link to ICU libs -LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc -LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n -LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw -LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil -LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio - ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< diff --git a/icu4c/source/config/mh-hpux-acc b/icu4c/source/config/mh-hpux-acc index 9d33a403c07..8213c7cef48 100644 --- a/icu4c/source/config/mh-hpux-acc +++ b/icu4c/source/config/mh-hpux-acc @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-hpux-acc,v 1.24 2001/09/28 00:31:53 aheninger-oss Exp $ +## $Id: mh-hpux-acc,v 1.25 2001/10/03 23:32:11 grhoten-oss Exp $ ## Commands to generate dependency files GEN_DEPS.c= : @@ -34,33 +34,11 @@ LDLIBRARYPATH_ENVVAR = SHLIB_PATH ## Compiler switch to embed a library name LD_SONAME = -Wl,+h,$(MIDDLE_SO_TARGET) -## Versioned target for a shared library. -FINAL_SO_TARGET = $(basename $(SO_TARGET)).$(SO_TARGET_VERSION) -MIDDLE_SO_TARGET = $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR) - -### How ICU libraries are named... ex. $(LIBICU)uc$(SO) -## Prefix for the ICU library names -ICUPREFIX = icu -LIBICU = lib$(ICUPREFIX) ## Shared object suffix SO= sl ## Non-shared intermediate object suffix STATIC_O = o -## Force removal [for make clean] -RMV = rm -rf -## Platform commands to remove or move executable and library targets -INSTALL-S = $(INSTALL_PROGRAM) -INSTALL-L = $(INSTALL_DATA) - -## Link commands to link to ICU libs -LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -l$(ICUPREFIX)data -LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc $(LIBICUDT) -LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n -LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw -LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil -LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio - ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< @@ -86,9 +64,9 @@ LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio ## Versioned libraries rules -%.$(SO_TARGET_VERSION_MAJOR): %.$(SO_TARGET_VERSION) +%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) $(RM) $@ && ln -s $< $@ -%.$(SO): %.$(SO_TARGET_VERSION_MAJOR) - $(RM) $@ && ln -s $*.$(SO_TARGET_VERSION) $@ +%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR) + $(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@ ## End HP/UX-specific setup diff --git a/icu4c/source/config/mh-hpux-cc b/icu4c/source/config/mh-hpux-cc index 39037c08c3c..e3bb1636a12 100644 --- a/icu4c/source/config/mh-hpux-cc +++ b/icu4c/source/config/mh-hpux-cc @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-hpux-cc,v 1.27 2001/09/28 00:31:53 aheninger-oss Exp $ +## $Id: mh-hpux-cc,v 1.28 2001/10/03 23:32:11 grhoten-oss Exp $ ## This causes source/tools/pkgdata generated makefiles to create and link @@ -16,15 +16,15 @@ GEN_DEPS.c= : GEN_DEPS.cc= : ## Commands to compile -COMPILE.c= $(CC) -D__STDC__ +z -Ae $(DEFS) $(CPPFLAGS) $(CFLAGS) -c -COMPILE.cc= $(CXX) +dup_static_removal +d -D__STDC__ +z +a1 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c +COMPILE.c= $(CC) -D__STDC__ +z -Ae $(DEFS) $(CPPFLAGS) $(CFLAGS) -c +COMPILE.cc= $(CXX) +dup_static_removal +d -D__STDC__ +z +a1 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c ## Commands to link ## We need to use the C++ linker, even when linking C programs, since ## our libraries contain C++ code (bug in linker?) #LINK.c= $(CC) +z -Ae $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -LINK.c= $(CXX) +z +a1 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,+s -LINK.cc= $(CXX) +z +a1 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,+s +LINK.c= $(CXX) +z +a1 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,+s +LINK.cc= $(CXX) +z +a1 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,+s ## Commands to make a shared library #SHLIB.c= $(LD) $(LDFLAGS) -b @@ -41,33 +41,11 @@ LDLIBRARYPATH_ENVVAR = SHLIB_PATH ## Compiler switch to embed a library name LD_SONAME = -Wl,+h,$(MIDDLE_SO_TARGET) -## Versioned target for a shared library. -FINAL_SO_TARGET = $(basename $(SO_TARGET)).$(SO_TARGET_VERSION) -MIDDLE_SO_TARGET = $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR) - -### How ICU libraries are named... ex. $(LIBICU)uc$(SO) -## Prefix for the ICU library names -ICUPREFIX = icu -LIBICU = lib$(ICUPREFIX) ## Shared object suffix SO= sl ## Non-shared intermediate object suffix STATIC_O = o -## Force removal [for make clean] -RMV = rm -rf -## Platform commands to remove or move executable and library targets -INSTALL-S = $(INSTALL_PROGRAM) -INSTALL-L = $(INSTALL_DATA) - -## Link commands to link to ICU libs -LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -l$(ICUPREFIX)data -LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc $(LIBICUDT) -LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n -LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw -LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil -LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio - ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< @@ -93,10 +71,10 @@ LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio ## Versioned libraries rules -%.$(SO_TARGET_VERSION_MAJOR): %.$(SO_TARGET_VERSION) +%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) $(RM) $@ && ln -s $< $@ -%.$(SO): %.$(SO_TARGET_VERSION_MAJOR) - $(RM) $@ && ln -s $*.$(SO_TARGET_VERSION) $@ +%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR) + $(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@ ## End HP/UX-specific setup diff --git a/icu4c/source/config/mh-irix b/icu4c/source/config/mh-irix index 7a6053fc00f..9425ffd353d 100644 --- a/icu4c/source/config/mh-irix +++ b/icu4c/source/config/mh-irix @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-irix,v 1.18 2001/09/28 00:31:53 aheninger-oss Exp $ +## $Id: mh-irix,v 1.19 2001/10/03 23:32:11 grhoten-oss Exp $ ## Flags for position independent code SHAREDLIBCFLAGS = -shared @@ -14,10 +14,6 @@ SHAREDLIBCPPFLAGS = GEN_DEPS.c= $(CC) -E -M $(DEFS) $(CPPFLAGS) GEN_DEPS.cc= $(CXX) -E -M $(DEFS) $(CPPFLAGS) -## Commands to compile -COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c -COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c - ## Commands to link ## We need to use the C++ linker, even when linking C programs, since ## our libraries contain C++ code (C++ static init not called) @@ -26,46 +22,18 @@ LINK.c= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) LINK.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) ## Commands to make a shared library -## SHLIB.c= ${PLATFORM_CPP_COMPILER} -D${PLATFORM} -shared -## SHLIB.cc= ${PLATFORM_C_COMPILER} -D${PLATFORM} -shared -## SHLIB.c= ${PLATFORM_CPP_COMPILER} -## SHLIB.c= ${PLATFORM_C_COMPILER} -SHLIB.c= $(CC) -shared $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -SHLIB.cc= $(CXX) -shared $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) +SHLIB.c= $(CC) -shared $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) +SHLIB.cc= $(CXX) -shared $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) ## Compiler switch to embed a runtime search path LD_RPATH= LD_RPATH_PRE= -Wl,-rpath, -## Environment variable to set a runtime search path -LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH - -## Versioned target for a shared library. -FINAL_SO_TARGET = $(SO_TARGET) -MIDDLE_SO_TARGET = - -### How ICU libraries are named... ex. $(LIBICU)uc$(SO) -## Prefix for the ICU library names -ICUPREFIX = icu -LIBICU = lib$(ICUPREFIX) ## Shared object suffix SO= so ## Non-shared intermediate object suffix STATIC_O = ao -## Force removal [for make clean] -RMV = rm -rf -## Platform commands to remove or move executable and library targets -INSTALL-S = $(INSTALL_PROGRAM) -INSTALL-L = $(INSTALL_DATA) - -## Link commands to link to ICU libs -LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc -LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n -LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw -LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil -LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio - ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< diff --git a/icu4c/source/config/mh-linux b/icu4c/source/config/mh-linux index 35eac247958..7dac24a9dad 100644 --- a/icu4c/source/config/mh-linux +++ b/icu4c/source/config/mh-linux @@ -1,13 +1,13 @@ ## -*-makefile-*- ## Linux-specific setup -## Copyright (c) 1999-2000, International Business Machines Corporation and +## Copyright (c) 1999-2001, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-linux,v 1.28 2001/10/03 21:54:10 emader-oss Exp $ +## $Id: mh-linux,v 1.29 2001/10/03 23:32:11 grhoten-oss Exp $ ## Commands to generate dependency files -GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) -GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) +GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) +GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) ## Flags for position independent code SHAREDLIBCFLAGS = -fPIC @@ -18,56 +18,18 @@ SHAREDLIBCPPFLAGS = -DPIC LIBCPPFLAGS = -D_REENTRANT THREADSCPPFLAGS = -D_REENTRANT -## Commands to compile -COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c -COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c - -## Commands to link -LINK.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -LINK.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) - -## Commands to make a shared library -SHLIB.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared -SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared - ## Compiler switch to embed a runtime search path LD_RPATH= -LD_RPATH_PRE= -Wl,-rpath, - -## Environment variable to set a runtime search path -LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH +LD_RPATH_PRE = -Wl,-rpath, ## Compiler switch to embed a library name LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET) -## Versioned target for a shared library. -FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) -MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR) - -### How ICU libraries are named... ex. $(LIBICU)uc$(SO) -## Prefix for the ICU library names -ICUPREFIX = icu -LIBICU = lib$(ICUPREFIX) ## Shared object suffix SO = so ## Non-shared intermediate object suffix STATIC_O = ao -## Force removal [for make clean] -RMV = rm -rf -## Platform commands to remove or move executable and library targets -INSTALL-S = $(INSTALL_PROGRAM) -INSTALL-L = $(INSTALL_DATA) - -## Link commands to link to ICU libs -LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -l$(ICUPREFIX)data -LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc$(ICULIBSUFFIX) $(LIBICUDT) -Wl,-rpath-link $(top_builddir)/data -LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n$(ICULIBSUFFIX) -LIBICULE= -L$(top_builddir)/layout -l$(ICUPREFIX)layout$(ICULIBSSUFFIX) -LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX) -LIBICUTOOLUTIL= -L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil$(ICULIBSUFFIX) -LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio$(ICULIBSUFFIX) - ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< diff --git a/icu4c/source/config/mh-os390 b/icu4c/source/config/mh-os390 index 1e0fd8c3217..dd04208f5c3 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.23 2001/03/21 20:31:13 weiv Exp $ +## $Id: mh-os390,v 1.24 2001/10/03 23:32:11 grhoten-oss Exp $ ################################################################### # IMPORTANT NOTE # @@ -47,10 +47,6 @@ GEN_DEPS.cc= makedep COMPILE.c= _CXX_CXXSUFFIX="cpp" _CXX_STEPS="-1" $(CXX) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(CFLAGS390) $(DEFS390) -c COMPILE.cc= _CXX_CXXSUFFIX="cpp" _CXX_STEPS="-1" $(CXX) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(CFLAGS390) $(DEFS390) -c -## Commands to link -LINK.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -LINK.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) - ## Commands for shared library (dll) SHLIB.c= $(LINK.c) -Wl,dll SHLIB.cc= $(LINK.cc) -Wl,dll @@ -58,34 +54,23 @@ SHLIB.cc= $(LINK.cc) -Wl,dll ## Compiler switch to embed a runtime search path LD_RPATH= -I -## Environment variable to set a runtime search path -LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH - ## Versioned target for a shared library. -FINAL_SO_TARGET = $(SO_TARGET) +FINAL_SO_TARGET = $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO) MIDDLE_SO_TARGET = -### How ICU libraries are named... ex. $(LIBICU)uc$(SO) -## Prefix for the ICU library names -ICUPREFIX = icu -LIBICU = lib$(ICUPREFIX) ## Shared object suffix (switch to dll for shared library build) SO= dll ## Non-shared intermediate object suffix STATIC_O = o -## Force removal [for make clean] -RMV = rm -rf -## Platform commands to remove or move executable and library targets -INSTALL-S = $(INSTALL_PROGRAM) -INSTALL-L = $(INSTALL_DATA) - ## Link commands to link to ICU libs -LIBICUUC= $(top_builddir)/common/libicuuc.x -LIBICUI18N= $(top_builddir)/i18n/libicui18n.x -LIBCTESTFW= $(top_builddir)/tools/ctestfw/libctestfw.x -LIBICUTOOLUTIL=$(top_builddir)/tools/toolutil/libicutoolutil.x -LIBUSTDIO= $(top_builddir)/extra/ustdio/libustdio.x +LIBICUDT= $(top_builddir)/data/libicudata.$(SO_TARGET_VERSION).x +LIBICUUC= $(top_builddir)/common/libicuuc.$(SO_TARGET_VERSION).x +LIBICUI18N= $(top_builddir)/i18n/libicui18n.$(SO_TARGET_VERSION).x +LIBICULE= $(top_builddir)/layout/libicule.$(SO_TARGET_VERSION).x +LIBCTESTFW= $(top_builddir)/tools/ctestfw/libctestfw.$(SO_TARGET_VERSION).x +LIBICUTOOLUTIL= $(top_builddir)/tools/toolutil/libicutoolutil.$(SO_TARGET_VERSION).x +LIBUSTDIO= $(top_builddir)/extra/ustdio/libustdio.$(SO_TARGET_VERSION).x ## Special 390 rules @@ -120,4 +105,8 @@ LIBUSTDIO= $(top_builddir)/extra/ustdio/libustdio.x @$(SHELL) -ec 'touch $*.u > /dev/null 2>&1' @$(SHELL) -ec '$(GEN_DEPS.cc) -f $*.u $< > /dev/null 2>&1' +## Versioned libraries rules +%.$(SO): %.$(SO_TARGET_VERSION).$(SO) + $(RM) $@ && ln -s $*.$(SO_TARGET_VERSION).$(SO) $@ + ## End 390-specific setup diff --git a/icu4c/source/config/mh-os400 b/icu4c/source/config/mh-os400 index 9cd5f12be22..cc61be27574 100644 --- a/icu4c/source/config/mh-os400 +++ b/icu4c/source/config/mh-os400 @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2001, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-os400,v 1.13 2001/06/01 18:15:03 grhoten Exp $ +## $Id: mh-os400,v 1.14 2001/10/03 23:32:11 grhoten-oss Exp $ GEN_DEPS.c= $(CC1) -E -M $(DEFS) $(CPPFLAGS) GEN_DEPS.cc= $(CXX1) -E -M $(DEFS) $(CPPFLAGS) @@ -58,8 +58,10 @@ INSTALL-S = cp -fph INSTALL-L = $(INSTALL-S) ## Link commands to link to ICU service programs +LIBICUDT = $(top_builddir)/data/libicudata.o LIBICUUC = $(top_builddir)/common/libicuuc.o LIBICUI18N = $(top_builddir)/i18n/libicui18n.o +LIBICULE = $(top_builddir)/layout/libicule.o LIBCTESTFW = $(top_builddir)/tools/ctestfw/libctestfw.o LIBICUTOOLUTIL = $(top_builddir)/tools/toolutil/libicutoolutil.o LIBUSTDIO= $(top_builddir)/extra/ustdio/libustdio.o diff --git a/icu4c/source/config/mh-ptx b/icu4c/source/config/mh-ptx index 241b79ca328..7aa60255830 100644 --- a/icu4c/source/config/mh-ptx +++ b/icu4c/source/config/mh-ptx @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-ptx,v 1.15 2001/09/28 00:31:53 aheninger-oss Exp $ +## $Id: mh-ptx,v 1.16 2001/10/03 23:32:11 grhoten-oss Exp $ ## Flags for position independent code SHAREDLIBCFLAGS = -KPIC @@ -31,35 +31,15 @@ SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -DPTX -G LD_RPATH= -R LD_RPATH_PRE= -## Environment variable to set a runtime search path -LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH - ## Versioned target for a shared library. FINAL_SO_TARGET = $(SO_TARGET) MIDDLE_SO_TARGET = -### How ICU libraries are named... ex. $(LIBICU)uc$(SO) -## Prefix for the ICU library names -ICUPREFIX = icu -LIBICU = lib$(ICUPREFIX) ## Shared object suffix SO= so ## Non-shared intermediate object suffix STATIC_O = ao -## Force removal [for make clean] -RMV = rm -rf -## Platform commands to remove or move executable and library targets -INSTALL-S = $(INSTALL_PROGRAM) -INSTALL-L = $(INSTALL_DATA) - -## Link commands to link to ICU libs -LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc -LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n -LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw -LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil -LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio - ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< diff --git a/icu4c/source/config/mh-solaris b/icu4c/source/config/mh-solaris index 80914767184..7d9a5c9eb93 100644 --- a/icu4c/source/config/mh-solaris +++ b/icu4c/source/config/mh-solaris @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-solaris,v 1.23 2001/09/28 00:31:53 aheninger-oss Exp $ +## $Id: mh-solaris,v 1.24 2001/10/03 23:32:11 grhoten-oss Exp $ ## Flags for position independent code SHAREDLIBCFLAGS = -KPIC @@ -11,12 +11,12 @@ SHAREDLIBCXXFLAGS = -KPIC SHAREDLIBCPPFLAGS = -DPIC ## Commands to generate dependency files -GEN_DEPS.c= $(CC) -xM $(DEFS) $(CPPFLAGS) -GEN_DEPS.cc= $(CXX) -xM $(DEFS) $(CPPFLAGS) +GEN_DEPS.c= $(CC) -xM $(DEFS) $(CPPFLAGS) +GEN_DEPS.cc= $(CXX) -xM $(DEFS) $(CPPFLAGS) ## Commands to compile -COMPILE.c= $(CC) -mt $(DEFS) $(CPPFLAGS) $(CFLAGS) -c -COMPILE.cc= $(CXX) -mt $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c +COMPILE.c= $(CC) -mt $(DEFS) $(CPPFLAGS) $(CFLAGS) -c +COMPILE.cc= $(CXX) -mt $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c ## Commands to link #LINK.c= $(CC) -mt $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) @@ -38,33 +38,11 @@ LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH ## Compiler switch to embed a library name LD_SONAME = -h $(MIDDLE_SO_TARGET) -## Versioned target for a shared library. -FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) -MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR) - -### How ICU libraries are named... ex. $(LIBICU)uc$(SO) -## Prefix for the ICU library names -ICUPREFIX = icu -LIBICU = lib$(ICUPREFIX) ## Shared object suffix SO= so ## Non-shared intermediate object suffix STATIC_O = ao -## Force removal [for make clean] -RMV = rm -rf -## Platform commands to remove or move executable and library targets -INSTALL-S = $(INSTALL_PROGRAM) -INSTALL-L = $(INSTALL_DATA) - -## Link commands to link to ICU libs -LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -licudata -LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc $(LIBICUDT) -LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n -LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw -LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil -LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio - ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< diff --git a/icu4c/source/config/mh-solaris-gcc b/icu4c/source/config/mh-solaris-gcc index 90c3a94063c..8f24a7e0c11 100644 --- a/icu4c/source/config/mh-solaris-gcc +++ b/icu4c/source/config/mh-solaris-gcc @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-solaris-gcc,v 1.22 2001/09/28 00:31:53 aheninger-oss Exp $ +## $Id: mh-solaris-gcc,v 1.23 2001/10/03 23:32:11 grhoten-oss Exp $ ## Flags for position independent code SHAREDLIBCFLAGS = -fPIC @@ -14,14 +14,6 @@ SHAREDLIBCPPFLAGS = -DPIC GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) -## Commands to compile -COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c -COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c - -## Commands to link -LINK.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -LINK.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) - ## Commands to make a shared library SHLIB.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -G SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -G @@ -30,43 +22,14 @@ SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -G LD_RPATH= -R LD_RPATH_PRE= -## Environment variable to set a runtime search path -LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH - ## Compiler switch to embed a library name LD_SONAME = -h $(MIDDLE_SO_TARGET) -## Versioned target for a shared library. -FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) -MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR) - -## Versioned target for a shared library. -FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) -MIDDLE_SO_TARGET = $(SO_TARGET) - -### How ICU libraries are named... ex. $(LIBICU)uc$(SO) -## Prefix for the ICU library names -ICUPREFIX = icu -LIBICU = lib$(ICUPREFIX) ## Shared object suffix SO= so ## Non-shared intermediate object suffix STATIC_O = ao -## Force removal [for make clean] -RMV = rm -rf -## Platform commands to remove or move executable and library targets -INSTALL-S = $(INSTALL_PROGRAM) -INSTALL-L = $(INSTALL_DATA) - -## Link commands to link to ICU libs -LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -licudata -LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc $(LIBICUDT) -LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n -LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw -LIBICUTOOLUTIL= -L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil -LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio - ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< diff --git a/icu4c/source/config/mh-solaris-sparcv9 b/icu4c/source/config/mh-solaris-sparcv9 index 871742e75b8..3961223ef52 100644 --- a/icu4c/source/config/mh-solaris-sparcv9 +++ b/icu4c/source/config/mh-solaris-sparcv9 @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-solaris-sparcv9,v 1.19 2001/09/28 00:31:53 aheninger-oss Exp $ +## $Id: mh-solaris-sparcv9,v 1.20 2001/10/03 23:32:11 grhoten-oss Exp $ ## Commands to generate dependency files GEN_DEPS.c= $(CC) -xtarget=ultra -xarch=v9 -xM $(DEFS) $(CPPFLAGS) @@ -26,39 +26,14 @@ SHLIB.cc= $(CXX) -xtarget=ultra -xarch=v9 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFL LD_RPATH= -R LD_RPATH_PRE= -## Environment variable to set a runtime search path -LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH - ## Compiler switch to embed a library name LD_SONAME = -h $(MIDDLE_SO_TARGET) -## Versioned target for a shared library. -FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) -MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR) - -### How ICU libraries are named... ex. $(LIBICU)uc$(SO) -## Prefix for the ICU library names -ICUPREFIX = icu -LIBICU = lib$(ICUPREFIX) ## Shared object suffix SO= so ## Non-shared intermediate object suffix STATIC_O = o -## Force removal [for make clean] -RMV = rm -rf -## Platform commands to remove or move executable and library targets -INSTALL-S = $(INSTALL_PROGRAM) -INSTALL-L = $(INSTALL_DATA) - -## Link commands to link to ICU libs -LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -licudata -LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc $(LIBICUDT) -LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n -LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw -LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil -LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio - ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< diff --git a/icu4c/source/data/icupkg.inc.in b/icu4c/source/data/icupkg.inc.in index f441fe1129a..02857621ef5 100644 --- a/icu4c/source/data/icupkg.inc.in +++ b/icu4c/source/data/icupkg.inc.in @@ -78,6 +78,7 @@ platform=@platform@ ld_rpath_suf=@ld_rpath_suf@ +include $(top_builddir)/icudefs.mk include @platform_make_fragment@ top_builddir = ../.. diff --git a/icu4c/source/extra/uconv/pkgdata.inc.in b/icu4c/source/extra/uconv/pkgdata.inc.in index f441fe1129a..02857621ef5 100644 --- a/icu4c/source/extra/uconv/pkgdata.inc.in +++ b/icu4c/source/extra/uconv/pkgdata.inc.in @@ -78,6 +78,7 @@ platform=@platform@ ld_rpath_suf=@ld_rpath_suf@ +include $(top_builddir)/icudefs.mk include @platform_make_fragment@ top_builddir = ../.. diff --git a/icu4c/source/icudefs.mk.in b/icu4c/source/icudefs.mk.in index ab5a5e80d25..54c1d4dc0ff 100644 --- a/icu4c/source/icudefs.mk.in +++ b/icu4c/source/icudefs.mk.in @@ -3,9 +3,13 @@ # # Yves Arrouye. # -# Copyright (C) 2000, International Business Machines Corporation and others. +# Copyright (C) 2000-2001, International Business Machines Corporation and others. # All Rights Reserved. +# +# Some of these variables are overridden in the config/mh-* files. +# + # Shell to use SHELL = @SHELL@ @@ -69,3 +73,42 @@ CXX = @CXX@ ECHO_N = @ECHO_N@ ECHO_C = @ECHO_C@ +# Commands to compile +COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c +COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c + +# Commands to link +LINK.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) +LINK.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) + +# Commands to make a shared library +SHLIB.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared +SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared + +# Environment variable to set a runtime search path +LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH + +# Versioned target for a shared library. +FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) +MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR) + +## How ICU libraries are named... ex. $(LIBICU)uc$(SO) +# Prefix for the ICU library names +ICUPREFIX = icu +LIBICU = lib$(ICUPREFIX) + +# Force removal [for make clean] +RMV = rm -rf +# Platform commands to remove or move executable and library targets +INSTALL-S = $(INSTALL_PROGRAM) +INSTALL-L = $(INSTALL_DATA) + +# Link commands to link to ICU libs +LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -l$(ICUPREFIX)data +LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc$(ICULIBSUFFIX) $(LIBICUDT) +LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n$(ICULIBSUFFIX) +LIBICULE= -L$(top_builddir)/layout -l$(ICUPREFIX)layout$(ICULIBSSUFFIX) +LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX) +LIBICUTOOLUTIL= -L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil$(ICULIBSUFFIX) +LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio$(ICULIBSUFFIX) + diff --git a/icu4c/source/tools/pkgdata/icupkg.inc.in b/icu4c/source/tools/pkgdata/icupkg.inc.in index f441fe1129a..02857621ef5 100644 --- a/icu4c/source/tools/pkgdata/icupkg.inc.in +++ b/icu4c/source/tools/pkgdata/icupkg.inc.in @@ -78,6 +78,7 @@ platform=@platform@ ld_rpath_suf=@ld_rpath_suf@ +include $(top_builddir)/icudefs.mk include @platform_make_fragment@ top_builddir = ../..