From 2dfb6e32d30cdcef62aa6457327085db9cbe72ef Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl@icu-project.org>
Date: Thu, 13 Jul 2000 20:03:16 +0000
Subject: [PATCH] ICU-290 use built DLLs for tools

X-SVN-Rev: 1857
---
 icu4c/source/tools/genccode/Makefile.in | 2 +-
 icu4c/source/tools/gencmn/Makefile.in   | 2 +-
 icu4c/source/tools/gencnval/Makefile.in | 2 +-
 icu4c/source/tools/gennames/Makefile.in | 2 +-
 icu4c/source/tools/genprops/Makefile.in | 2 +-
 icu4c/source/tools/genrb/Makefile.in    | 2 +-
 icu4c/source/tools/gentest/Makefile.in  | 2 +-
 icu4c/source/tools/gentz/Makefile.in    | 2 +-
 icu4c/source/tools/makeconv/Makefile.in | 2 +-
 icu4c/source/tools/makeconv/ucmfiles.mk | 2 +-
 icu4c/source/tools/pkgdata/Makefile.in  | 2 +-
 icu4c/source/tools/rbdump/Makefile.in   | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/icu4c/source/tools/genccode/Makefile.in b/icu4c/source/tools/genccode/Makefile.in
index 822f9429a6e..d0f4a06993c 100644
--- a/icu4c/source/tools/genccode/Makefile.in
+++ b/icu4c/source/tools/genccode/Makefile.in
@@ -53,7 +53,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir
 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
+$(LD_RPATH)$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/tools/toolutil@ld_rpath_suf@$(LD_RPATH_PRE)$(libdir)
 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 d91fc4bbab1..724d34fbc2d 100644
--- a/icu4c/source/tools/gencmn/Makefile.in
+++ b/icu4c/source/tools/gencmn/Makefile.in
@@ -53,7 +53,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir
 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
+$(LD_RPATH)$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/tools/toolutil@ld_rpath_suf@$(LD_RPATH_PRE)$(libdir)
 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 db8778ed1fe..9ba2573f5a0 100644
--- a/icu4c/source/tools/gencnval/Makefile.in
+++ b/icu4c/source/tools/gencnval/Makefile.in
@@ -57,7 +57,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir
 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
+$(LD_RPATH)$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/tools/toolutil@ld_rpath_suf@$(LD_RPATH_PRE)$(libdir)
 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 d7830d8e0ce..19c4de82d1f 100644
--- a/icu4c/source/tools/gennames/Makefile.in
+++ b/icu4c/source/tools/gennames/Makefile.in
@@ -59,7 +59,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir
 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
+$(LD_RPATH)$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/tools/toolutil@ld_rpath_suf@$(LD_RPATH_PRE)$(libdir)
 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 fa53accaeae..92b0c439e64 100644
--- a/icu4c/source/tools/genprops/Makefile.in
+++ b/icu4c/source/tools/genprops/Makefile.in
@@ -58,7 +58,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir
 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
+$(LD_RPATH)$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/tools/toolutil@ld_rpath_suf@$(LD_RPATH_PRE)$(libdir)
 LIBS = $(LIBICU-UC)  @LIBS@ @LIB_M@  $(LIBICU-TOOLUTIL)
 
 OBJECTS = genprops.o store.o
diff --git a/icu4c/source/tools/genrb/Makefile.in b/icu4c/source/tools/genrb/Makefile.in
index 341af3a07ab..dd7072a714e 100644
--- a/icu4c/source/tools/genrb/Makefile.in
+++ b/icu4c/source/tools/genrb/Makefile.in
@@ -52,7 +52,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_sr
 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@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/extra/ustdio
+$(LD_RPATH)$(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@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/extra/ustdio@ld_rpath_suf@$(LD_RPATH_PRE)$(libdir)
 LIBS = $(LIBICU-UC) $(LIBICU-I18N) @LIBS@ @LIB_M@  $(LIBICU-TOOLUTIL) $(LIBUSTDIO)
 
 ##OBJECTS = error.o genrb.o ustr.o parse.o read.o write.o list.o	\
diff --git a/icu4c/source/tools/gentest/Makefile.in b/icu4c/source/tools/gentest/Makefile.in
index 0f78eb8be9c..8eafe210ed9 100644
--- a/icu4c/source/tools/gentest/Makefile.in
+++ b/icu4c/source/tools/gentest/Makefile.in
@@ -59,7 +59,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir
 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
+$(LD_RPATH)$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/tools/toolutil@ld_rpath_suf@$(LD_RPATH_PRE)$(libdir)
 LIBS = $(LIBICU-UC)  @LIBS@ @LIB_M@  $(LIBICU-TOOLUTIL)
 
 OBJECTS = gentest.o
diff --git a/icu4c/source/tools/gentz/Makefile.in b/icu4c/source/tools/gentz/Makefile.in
index 6bb6d6bf855..acfd3a1eeaa 100644
--- a/icu4c/source/tools/gentz/Makefile.in
+++ b/icu4c/source/tools/gentz/Makefile.in
@@ -58,7 +58,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_sr
 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
+$(LD_RPATH)$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/tools/toolutil@ld_rpath_suf@$(LD_RPATH_PRE)$(libdir)
 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 e9c887fa552..85845d255a2 100644
--- a/icu4c/source/tools/makeconv/Makefile.in
+++ b/icu4c/source/tools/makeconv/Makefile.in
@@ -55,7 +55,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir
 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
+$(LD_RPATH)$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/tools/toolutil@ld_rpath_suf@$(LD_RPATH_PRE)$(libdir)
 LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ $(LIBICU-TOOLUTIL)
 
 OBJECTS = makeconv.o ucnvstat.o genmbcs.o
diff --git a/icu4c/source/tools/makeconv/ucmfiles.mk b/icu4c/source/tools/makeconv/ucmfiles.mk
index 890d19c7b16..e96f70241d1 100644
--- a/icu4c/source/tools/makeconv/ucmfiles.mk
+++ b/icu4c/source/tools/makeconv/ucmfiles.mk
@@ -60,4 +60,4 @@ ibm-1160.ucm ibm-284.ucm ibm-857.ucm ibm-944.ucm\
 ibm-1164.ucm ibm-285.ucm ibm-858.ucm ibm-949.ucm\
 ibm-1250.ucm ibm-290.ucm ibm-859.ucm ibm-950.ucm\
 ibm-1251.ucm ibm-297.ucm ibm-860.ucm ibm-970.ucm\
-ibm-1252.ucm ibm-37-s390.ucm ibm-861.ucm lmb-excp.ucm ibm-954.ucm
\ No newline at end of file
+ibm-1252.ucm ibm-37-s390.ucm ibm-861.ucm lmb-excp.ucm ibm-954.ucm
diff --git a/icu4c/source/tools/pkgdata/Makefile.in b/icu4c/source/tools/pkgdata/Makefile.in
index a6bc7b22115..13b5e0552e9 100644
--- a/icu4c/source/tools/pkgdata/Makefile.in
+++ b/icu4c/source/tools/pkgdata/Makefile.in
@@ -53,7 +53,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir
 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
+$(LD_RPATH)$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/tools/toolutil@ld_rpath_suf@$(LD_RPATH_PRE)$(libdir)
 LIBS = $(LIBICU-UC)  @LIBS@ @LIB_M@   $(LIBICU-TOOLUTIL)
 
 OBJECTS = pkgdata.o pkgtypes.o gmake.o dllmode.o cmnmode.o
diff --git a/icu4c/source/tools/rbdump/Makefile.in b/icu4c/source/tools/rbdump/Makefile.in
index c80fb772b05..1bf879cd3a0 100644
--- a/icu4c/source/tools/rbdump/Makefile.in
+++ b/icu4c/source/tools/rbdump/Makefile.in
@@ -51,7 +51,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common
 CFLAGS = @CFLAGS@
 CXXFLAGS = @CXXFLAGS@
 LDFLAGS = @LDFLAGS@ \
-$(LD_RPATH)$(LD_RPATH_PRE)$(libdir)@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/common
+$(LD_RPATH)$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(libdir)
 LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@
 
 OBJECTS = read.o parse.o uprint.o