diff --git a/icu4c/source/config/mh-aix b/icu4c/source/config/mh-aix index 5f530f131d4..8a5c36a8bea 100644 --- a/icu4c/source/config/mh-aix +++ b/icu4c/source/config/mh-aix @@ -33,6 +33,7 @@ SO= a LIBICU-UC= -L$(top_builddir)/common -licu-uc LIBICU-I18N= -L$(top_builddir)/i18n -licu-i18n LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw +LIBICU-TOOLUTIL=-L$(top_builddir)/tools/toolutil -licu-toolutil ## Special AIX rules diff --git a/icu4c/source/config/mh-freebsd b/icu4c/source/config/mh-freebsd index 9b74b4ec3d8..4ef55a0bca4 100644 --- a/icu4c/source/config/mh-freebsd +++ b/icu4c/source/config/mh-freebsd @@ -30,6 +30,7 @@ SO= so LIBICU-UC= -L$(top_builddir)/common -licu-uc LIBICU-I18N= -L$(top_builddir)/i18n -licu-i18n LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw +LIBICU-TOOLUTIL=-L$(top_builddir)/tools/toolutil -licu-toolutil ## Compilation rules %.o : $(srcdir)/%.c @@ -52,3 +53,8 @@ LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw [ -s $@ ] || rm -f $@' ## End FreeBSD-specific setup + + + + + diff --git a/icu4c/source/config/mh-hpux-acc b/icu4c/source/config/mh-hpux-acc index 6a1f027fb2f..f827fd52312 100644 --- a/icu4c/source/config/mh-hpux-acc +++ b/icu4c/source/config/mh-hpux-acc @@ -33,6 +33,7 @@ SO= sl LIBICU-UC= -L$(top_builddir)/common -licu-uc LIBICU-I18N= -L$(top_builddir)/i18n -licu-i18n LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw +LIBICU-TOOLUTIL=-L$(top_builddir)/tools/toolutil -licu-toolutil ## Compilation rules %.o : $(srcdir)/%.c diff --git a/icu4c/source/config/mh-hpux-cc b/icu4c/source/config/mh-hpux-cc index 1afaebb6788..a21543e6a0b 100644 --- a/icu4c/source/config/mh-hpux-cc +++ b/icu4c/source/config/mh-hpux-cc @@ -34,6 +34,7 @@ SO= sl LIBICU-UC= -L$(top_builddir)/common -licu-uc LIBICU-I18N= -L$(top_builddir)/i18n -licu-i18n LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw +LIBICU-TOOLUTIL=-L$(top_builddir)/tools/toolutil -licu-toolutil ## Compilation rules %.o : $(srcdir)/%.c diff --git a/icu4c/source/config/mh-irix b/icu4c/source/config/mh-irix index d87d333941d..047c1607636 100644 --- a/icu4c/source/config/mh-irix +++ b/icu4c/source/config/mh-irix @@ -40,6 +40,7 @@ SO= so LIBICU-UC= -L$(top_builddir)/common -licu-uc LIBICU-I18N= -L$(top_builddir)/i18n -licu-i18n LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw +LIBICU-TOOLUTIL=-L$(top_builddir)/tools/toolutil -licu-toolutil ## Compilation rules %.o : $(srcdir)/%.c diff --git a/icu4c/source/config/mh-linux b/icu4c/source/config/mh-linux index c3af2afe9ca..0d19fc2e5c8 100644 --- a/icu4c/source/config/mh-linux +++ b/icu4c/source/config/mh-linux @@ -30,6 +30,7 @@ SO= so LIBICU-UC= -L$(top_builddir)/common -licu-uc LIBICU-I18N= -L$(top_builddir)/i18n -licu-i18n LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw +LIBICU-TOOLUTIL=-L$(top_builddir)/tools/toolutil -licu-toolutil ## Compilation rules %.o : $(srcdir)/%.c diff --git a/icu4c/source/config/mh-os390 b/icu4c/source/config/mh-os390 index 424face1924..6310822e4fa 100644 --- a/icu4c/source/config/mh-os390 +++ b/icu4c/source/config/mh-os390 @@ -79,6 +79,7 @@ SO= dll LIBICU-UC= $(top_builddir)/common/libicu-uc.x LIBICU-I18N= $(top_builddir)/i18n/libicu-i18n.x LIBCTESTFW= $(top_builddir)/tools/ctestfw/libctestfw.x +LIBICU-TOOLUTIL=$(top_builddir)/tools/toolutil/libicu-toolutil.x ## Special 390 rules diff --git a/icu4c/source/config/mh-solaris b/icu4c/source/config/mh-solaris index ae645078704..d78ac6ddae8 100644 --- a/icu4c/source/config/mh-solaris +++ b/icu4c/source/config/mh-solaris @@ -32,6 +32,7 @@ SO= so LIBICU-UC= -L$(top_builddir)/common -licu-uc LIBICU-I18N= -L$(top_builddir)/i18n -licu-i18n LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw +LIBICU-TOOLUTIL=-L$(top_builddir)/tools/toolutil -licu-toolutil ## Compilation rules %.o : $(srcdir)/%.c diff --git a/icu4c/source/config/mh-solaris-gcc b/icu4c/source/config/mh-solaris-gcc index 535a5948b5e..4f6a9683af9 100644 --- a/icu4c/source/config/mh-solaris-gcc +++ b/icu4c/source/config/mh-solaris-gcc @@ -30,6 +30,7 @@ SO= so LIBICU-UC= -L$(top_builddir)/common -licu-uc LIBICU-I18N= -L$(top_builddir)/i18n -licu-i18n LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw +LIBICU-TOOLUTIL=-L$(top_builddir)/tools/toolutil -licu-toolutil ## Compilation rules %.o : $(srcdir)/%.c diff --git a/icu4c/source/configure b/icu4c/source/configure index 8ec6d7c1c37..39977a967cd 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -2555,7 +2555,7 @@ case "${host}" in *-*-aix*) ld_rpath_suf="" ;; *-*-hpux*) ld_rpath_suf=":" ;; *-*-irix*) ld_rpath_suf=" " ;; - *-*-os390*) ld_rpath_suf=" " ;; + *-*-os390*) ld_rpath_suf="" ;; *) ld_rpath_suf="" ;; esac diff --git a/icu4c/source/configure.in b/icu4c/source/configure.in index e584bc5e9fc..33e6f2800fa 100644 --- a/icu4c/source/configure.in +++ b/icu4c/source/configure.in @@ -314,7 +314,7 @@ case "${host}" in *-*-aix*) ld_rpath_suf="" ;; *-*-hpux*) ld_rpath_suf=":" ;; *-*-irix*) ld_rpath_suf=" " ;; - *-*-os390*) ld_rpath_suf=" " ;; + *-*-os390*) ld_rpath_suf="" ;; *) ld_rpath_suf="" ;; esac AC_SUBST(ld_rpath_suf) diff --git a/icu4c/source/tools/genccode/Makefile.in b/icu4c/source/tools/genccode/Makefile.in index c8bf5764148..2e410b08222 100644 --- a/icu4c/source/tools/genccode/Makefile.in +++ b/icu4c/source/tools/genccode/Makefile.in @@ -54,7 +54,7 @@ CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ LDFLAGS = @LDFLAGS@ \ $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/tools/toolutil -LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ -L$(top_builddir)/tools/toolutil -licu-toolutil +LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ $(LIBICU-TOOLUTIL) OBJECTS = genccode.o diff --git a/icu4c/source/tools/gencmn/Makefile.in b/icu4c/source/tools/gencmn/Makefile.in index 7bf5213e589..cfe9f94a9d7 100644 --- a/icu4c/source/tools/gencmn/Makefile.in +++ b/icu4c/source/tools/gencmn/Makefile.in @@ -54,7 +54,7 @@ CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ LDFLAGS = @LDFLAGS@ \ $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/tools/toolutil -LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ -L$(top_builddir)/tools/toolutil -licu-toolutil +LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ $(LIBICU-TOOLUTIL) OBJECTS = gencmn.o diff --git a/icu4c/source/tools/gencnval/Makefile.in b/icu4c/source/tools/gencnval/Makefile.in index 4a187950352..8833a28d223 100644 --- a/icu4c/source/tools/gencnval/Makefile.in +++ b/icu4c/source/tools/gencnval/Makefile.in @@ -58,7 +58,7 @@ CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ LDFLAGS = @LDFLAGS@ \ $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/tools/toolutil -LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ -L$(top_builddir)/tools/toolutil -licu-toolutil +LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ $(LIBICU-TOOLUTIL) OBJECTS = gencnval.o diff --git a/icu4c/source/tools/gennames/Makefile.in b/icu4c/source/tools/gennames/Makefile.in index 987baef7d2d..92e0da626d2 100644 --- a/icu4c/source/tools/gennames/Makefile.in +++ b/icu4c/source/tools/gennames/Makefile.in @@ -59,7 +59,7 @@ CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ LDFLAGS = @LDFLAGS@ \ $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/tools/toolutil -LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ -L$(top_builddir)/tools/toolutil -licu-toolutil +LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ $(LIBICU-TOOLUTIL) OBJECTS = gennames.o diff --git a/icu4c/source/tools/genprops/Makefile.in b/icu4c/source/tools/genprops/Makefile.in index d9504dcdcab..92c6ad35840 100644 --- a/icu4c/source/tools/genprops/Makefile.in +++ b/icu4c/source/tools/genprops/Makefile.in @@ -59,7 +59,7 @@ CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ LDFLAGS = @LDFLAGS@ \ $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/tools/toolutil -LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ -L$(top_builddir)/tools/toolutil -licu-toolutil +LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ $(LIBICU-TOOLUTIL) OBJECTS = genprops.o diff --git a/icu4c/source/tools/genrb/Makefile.in b/icu4c/source/tools/genrb/Makefile.in index 6dac99def7b..4f8aac67b37 100644 --- a/icu4c/source/tools/genrb/Makefile.in +++ b/icu4c/source/tools/genrb/Makefile.in @@ -53,7 +53,7 @@ CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ LDFLAGS = @LDFLAGS@ \ $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/i18n@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/tools/toolutil -LIBS = $(LIBICU-UC) $(LIBICU-I18N) @LIBS@ @LIB_M@ -L$(top_builddir)/tools/toolutil -licu-toolutil +LIBS = $(LIBICU-UC) $(LIBICU-I18N) @LIBS@ @LIB_M@ $(LIBICU-TOOLUTIL) OBJECTS = error.o genrb.o ustr.o parse.o read.o write.o list.o \ rblist.o ufile.o ustdio.o util.o diff --git a/icu4c/source/tools/gentz/Makefile.in b/icu4c/source/tools/gentz/Makefile.in index b74fa759a5b..8227bf36377 100644 --- a/icu4c/source/tools/gentz/Makefile.in +++ b/icu4c/source/tools/gentz/Makefile.in @@ -59,7 +59,7 @@ CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ LDFLAGS = @LDFLAGS@ \ $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/tools/toolutil -LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ -L$(top_builddir)/tools/toolutil -licu-toolutil +LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ $(LIBICU-TOOLUTIL) OBJECTS = gentz.o diff --git a/icu4c/source/tools/makeconv/Makefile.in b/icu4c/source/tools/makeconv/Makefile.in index 91231dceee9..7fa5965695d 100644 --- a/icu4c/source/tools/makeconv/Makefile.in +++ b/icu4c/source/tools/makeconv/Makefile.in @@ -56,7 +56,7 @@ CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ LDFLAGS = @LDFLAGS@ \ $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/tools/toolutil -LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ -L$(top_builddir)/tools/toolutil -licu-toolutil +LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ $(LIBICU-TOOLUTIL) OBJECTS = makeconv.o