From dd68d5aa8172eb5158e17cc6037b991610045858 Mon Sep 17 00:00:00 2001 From: Yves Arrouye Date: Tue, 3 Oct 2000 23:19:26 +0000 Subject: [PATCH] ICU-630 do not use rpath by default; added --enable-rpath for when it is really needed. X-SVN-Rev: 2560 --- icu4c/source/config/mh-aix | 3 +++ icu4c/source/config/mh-aix-va | 3 +++ icu4c/source/config/mh-darwin | 3 +++ icu4c/source/config/mh-freebsd | 3 +++ icu4c/source/config/mh-hpux-acc | 3 +++ icu4c/source/config/mh-hpux-cc | 3 +++ icu4c/source/config/mh-irix | 3 +++ icu4c/source/config/mh-linux | 3 +++ icu4c/source/config/mh-os390 | 3 +++ icu4c/source/config/mh-os400 | 3 +++ icu4c/source/config/mh-ptx | 3 +++ icu4c/source/config/mh-solaris | 3 +++ icu4c/source/config/mh-solaris-gcc | 3 +++ icu4c/source/config/mh-solaris-sparcv9 | 3 +++ icu4c/source/samples/XMLConverter/Makefile.in | 8 +++++-- icu4c/source/samples/cal/Makefile.in | 8 +++++-- icu4c/source/samples/date/Makefile.in | 8 +++++-- icu4c/source/test/cintltst/Makefile.in | 10 ++++++--- icu4c/source/test/ieeetest/Makefile.in | 9 ++++++-- icu4c/source/test/intltest/Makefile.in | 9 ++++++-- icu4c/source/test/testmap/Makefile.in | 9 ++++---- icu4c/source/tools/Makefile.in | 22 ++++++++++--------- icu4c/source/tools/genccode/Makefile.in | 8 ++++--- icu4c/source/tools/gencmn/Makefile.in | 8 ++++--- icu4c/source/tools/gencnval/Makefile.in | 10 ++++++--- icu4c/source/tools/gennames/Makefile.in | 10 ++++++--- icu4c/source/tools/genprops/Makefile.in | 10 ++++++--- icu4c/source/tools/genrb/Makefile.in | 12 ++++++---- icu4c/source/tools/gentest/Makefile.in | 10 ++++++--- icu4c/source/tools/gentz/Makefile.in | 11 ++++++---- icu4c/source/tools/makeconv/Makefile.in | 12 ++++++---- icu4c/source/tools/rbdump/Makefile.in | 7 +++++- 32 files changed, 164 insertions(+), 59 deletions(-) diff --git a/icu4c/source/config/mh-aix b/icu4c/source/config/mh-aix index 17e0559db0f..e0f40ae6fd2 100644 --- a/icu4c/source/config/mh-aix +++ b/icu4c/source/config/mh-aix @@ -26,6 +26,9 @@ SHLIB.cc= makeC++SharedLib_r -p 5000 LD_RPATH= -I 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 = diff --git a/icu4c/source/config/mh-aix-va b/icu4c/source/config/mh-aix-va index 9d254d5eb1c..8488b2f94ab 100644 --- a/icu4c/source/config/mh-aix-va +++ b/icu4c/source/config/mh-aix-va @@ -26,6 +26,9 @@ SHLIB.cc= xlC_r -qmkshrobj LD_RPATH= -I 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 = diff --git a/icu4c/source/config/mh-darwin b/icu4c/source/config/mh-darwin index 44e697419e0..564d6e305fb 100644 --- a/icu4c/source/config/mh-darwin +++ b/icu4c/source/config/mh-darwin @@ -24,6 +24,9 @@ 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 = diff --git a/icu4c/source/config/mh-freebsd b/icu4c/source/config/mh-freebsd index 00e0d9d74f1..c2972edfe61 100644 --- a/icu4c/source/config/mh-freebsd +++ b/icu4c/source/config/mh-freebsd @@ -23,6 +23,9 @@ 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 + ## Versioned target for a shared library. FINAL_SO_TARGET = $(SO_TARGET) MIDDLE_SO_TARGET = diff --git a/icu4c/source/config/mh-hpux-acc b/icu4c/source/config/mh-hpux-acc index 764126ca1de..984401a2851 100644 --- a/icu4c/source/config/mh-hpux-acc +++ b/icu4c/source/config/mh-hpux-acc @@ -26,6 +26,9 @@ SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -b LD_RPATH= -Wl,+b, LD_RPATH_PRE= +## Environment variable to set a runtime search path +LDLIBRARYPATH_ENVVAR = SHLIB_PATH + ## Versioned target for a shared library. FINAL_SO_TARGET = $(SO_TARGET) MIDDLE_SO_TARGET = diff --git a/icu4c/source/config/mh-hpux-cc b/icu4c/source/config/mh-hpux-cc index 4cb80b50c73..116162c0f80 100644 --- a/icu4c/source/config/mh-hpux-cc +++ b/icu4c/source/config/mh-hpux-cc @@ -33,6 +33,9 @@ SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -b LD_RPATH= -Wl,+b, LD_RPATH_PRE= +## Environment variable to set a runtime search path +LDLIBRARYPATH_ENVVAR = SHLIB_PATH + ## Versioned target for a shared library. FINAL_SO_TARGET = $(SO_TARGET) MIDDLE_SO_TARGET = diff --git a/icu4c/source/config/mh-irix b/icu4c/source/config/mh-irix index e9ad6315c8f..36f6fcaedee 100644 --- a/icu4c/source/config/mh-irix +++ b/icu4c/source/config/mh-irix @@ -31,6 +31,9 @@ SHLIB.cc= $(CXX) -shared $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) LD_RPATH= -I 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 = diff --git a/icu4c/source/config/mh-linux b/icu4c/source/config/mh-linux index 9493fa3e275..0147069ff22 100644 --- a/icu4c/source/config/mh-linux +++ b/icu4c/source/config/mh-linux @@ -32,6 +32,9 @@ 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) diff --git a/icu4c/source/config/mh-os390 b/icu4c/source/config/mh-os390 index ac6736eb401..d77e892025e 100644 --- a/icu4c/source/config/mh-os390 +++ b/icu4c/source/config/mh-os390 @@ -55,6 +55,9 @@ 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) MIDDLE_SO_TARGET = diff --git a/icu4c/source/config/mh-os400 b/icu4c/source/config/mh-os400 index b13c1f32b94..2689792708a 100644 --- a/icu4c/source/config/mh-os400 +++ b/icu4c/source/config/mh-os400 @@ -26,6 +26,9 @@ ARFLAGS = -cuv LD_RPATH= -I LD_RPATH_PRE= -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) MIDDLE_SO_TARGET = diff --git a/icu4c/source/config/mh-ptx b/icu4c/source/config/mh-ptx index 386fbde31f2..a0f0faf1663 100644 --- a/icu4c/source/config/mh-ptx +++ b/icu4c/source/config/mh-ptx @@ -24,6 +24,9 @@ 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 = diff --git a/icu4c/source/config/mh-solaris b/icu4c/source/config/mh-solaris index 4d87e89b5b9..402fc1b7663 100644 --- a/icu4c/source/config/mh-solaris +++ b/icu4c/source/config/mh-solaris @@ -25,6 +25,9 @@ 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 + ## Versioned target for a shared library. FINAL_SO_TARGET = $(SO_TARGET) MIDDLE_SO_TARGET = diff --git a/icu4c/source/config/mh-solaris-gcc b/icu4c/source/config/mh-solaris-gcc index b331dbdeb0a..593ee06b323 100644 --- a/icu4c/source/config/mh-solaris-gcc +++ b/icu4c/source/config/mh-solaris-gcc @@ -23,6 +23,9 @@ 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 + ## Versioned target for a shared library. FINAL_SO_TARGET = $(SO_TARGET) MIDDLE_SO_TARGET = diff --git a/icu4c/source/config/mh-solaris-sparcv9 b/icu4c/source/config/mh-solaris-sparcv9 index e5332092050..b4e9404446a 100644 --- a/icu4c/source/config/mh-solaris-sparcv9 +++ b/icu4c/source/config/mh-solaris-sparcv9 @@ -24,6 +24,9 @@ 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 + ## Versioned target for a shared library. FINAL_SO_TARGET = $(SO_TARGET) MIDDLE_SO_TARGET = diff --git a/icu4c/source/samples/XMLConverter/Makefile.in b/icu4c/source/samples/XMLConverter/Makefile.in index a8ebc9c04bb..7eaa747d7ea 100644 --- a/icu4c/source/samples/XMLConverter/Makefile.in +++ b/icu4c/source/samples/XMLConverter/Makefile.in @@ -50,8 +50,12 @@ DEFS = @DEFS@ 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 +ENABLE_RPATH = @ENABLE_RPATH@ +ifeq ($(ENABLE_RPATH),YES) +RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) +endif +LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) +INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ OBJECTS = XMLConverter.o diff --git a/icu4c/source/samples/cal/Makefile.in b/icu4c/source/samples/cal/Makefile.in index ce51e66590d..693dd005508 100644 --- a/icu4c/source/samples/cal/Makefile.in +++ b/icu4c/source/samples/cal/Makefile.in @@ -59,8 +59,12 @@ DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n 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 +ENABLE_RPATH = @ENABLE_RPATH@ +ifeq ($(ENABLE_RPATH),YES) +RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) +endif +LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) +INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/i18n:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICU-I18N) $(LIBICU-UC) @LIBS@ @LIB_M@ OBJECTS = uprint.o cal.o diff --git a/icu4c/source/samples/date/Makefile.in b/icu4c/source/samples/date/Makefile.in index 48cbd70eb8c..89a25f01242 100644 --- a/icu4c/source/samples/date/Makefile.in +++ b/icu4c/source/samples/date/Makefile.in @@ -59,8 +59,12 @@ DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n 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 +ENABLE_RPATH = @ENABLE_RPATH@ +ifeq ($(ENABLE_RPATH),YES) +RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) +endif +LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) +INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/i18n:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICU-I18N) $(LIBICU-UC) @LIBS@ @LIB_M@ OBJECTS = uprint.o date.o diff --git a/icu4c/source/test/cintltst/Makefile.in b/icu4c/source/test/cintltst/Makefile.in index a08e60812c7..eba5b891c7e 100644 --- a/icu4c/source/test/cintltst/Makefile.in +++ b/icu4c/source/test/cintltst/Makefile.in @@ -69,8 +69,12 @@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_sr -DICU_UNICODE_VERSION=\"$(UNICODE_VERSION)\" -DICU_VERSION=\"@VERSION@\" CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ -LDFLAGS = @LDFLAGS@ \ -$(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/ctestfw +ENABLE_RPATH = @ENABLE_RPATH@ +ifeq ($(ENABLE_RPATH),YES) +RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) +endif +LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) +INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/i18n:$(top_builddir)/tools/ctestfw:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBCTESTFW) $(LIBICU-I18N) $(LIBICU-UC) @LIBS@ @LIB_M@ OBJECTS = callcoll.o calltest.o capitst.o cbiapts.o cbkittst.o \ @@ -114,7 +118,7 @@ distclean-local: clean-local $(RMV) Makefile check-local: all-local - ICU_DATA=$(top_builddir)/data/ TZ=PST8PDT ./$(TARGET) + ICU_DATA=$(top_builddir)/data/ TZ=PST8PDT $(INVOKE) ./$(TARGET) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/icu4c/source/test/ieeetest/Makefile.in b/icu4c/source/test/ieeetest/Makefile.in index f94fc4bae4a..8dc9310030f 100644 --- a/icu4c/source/test/ieeetest/Makefile.in +++ b/icu4c/source/test/ieeetest/Makefile.in @@ -51,7 +51,12 @@ DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ -LDFLAGS = @LDFLAGS@ $(LD_RPATH)$(LD_RPATH_PRE)$(top_builddir)/common +ENABLE_RPATH = @ENABLE_RPATH@ +ifeq ($(ENABLE_RPATH),YES) +RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) +endif +LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) +INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ OBJECTS = ieeetest.o @@ -87,7 +92,7 @@ distclean-local: clean-local $(RMV) Makefile check-local: all-local - - ICU_DATA=$(top_srcdir)/../data/ ./$(TARGET) + - ICU_DATA=$(top_srcdir)/../data/ $(INVOKE) ./$(TARGET) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/icu4c/source/test/intltest/Makefile.in b/icu4c/source/test/intltest/Makefile.in index 4f7c7152640..81babed913d 100644 --- a/icu4c/source/test/intltest/Makefile.in +++ b/icu4c/source/test/intltest/Makefile.in @@ -52,7 +52,12 @@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_sr CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ LDFLAGS = @LDFLAGS@ \ -$(LD_RPATH)$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/i18n +ENABLE_RPATH = @ENABLE_RPATH@ +ifeq ($(ENABLE_RPATH),YES) +RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) +endif +LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) +INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/i18n:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICU-I18N) $(LIBICU-UC) @LIBS@ @LIB_M@ OBJECTS = allcoll.o apicoll.o callimts.o calregts.o caltest.o \ @@ -99,7 +104,7 @@ distclean-local: clean-local $(RMV) Makefile check-local: all-local - ICU_DATA=$(top_builddir)/data/ TZ=PST8PDT ./$(TARGET) + ICU_DATA=$(top_builddir)/data/ TZ=PST8PDT $(INVOKE) ./$(TARGET) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/icu4c/source/test/testmap/Makefile.in b/icu4c/source/test/testmap/Makefile.in index e3fe5c63229..3770d413c35 100644 --- a/icu4c/source/test/testmap/Makefile.in +++ b/icu4c/source/test/testmap/Makefile.in @@ -7,7 +7,6 @@ SHELL = @SHELL@ UNICODE_VERSION = @UNICODE_VERSION@ - ## Install directory information srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -50,7 +49,6 @@ CLEANFILES = *~ $(DEPS) ## Target information TARGET = testmap - DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/common @@ -65,8 +63,9 @@ CPPFLAGS += @DATA_PACKAGING_CPPFLAGS@ CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ -LDFLAGS = @LDFLAGS@ \ -$(LD_RPATH)$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/../data@ld_rpath_suf@ +ENABLE_RPATH = @ENABLE_RPATH@ +LDFLAGS = @LDFLAGS@ +INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/data:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ $(LIBICUDATA) OBJECTS = testmap.o @@ -102,7 +101,7 @@ distclean-local: clean-local $(RMV) Makefile check-local: all-local - ICU_DATA=NOTHING ./$(TARGET) + ICU_DATA=NOTHING $(INVOKE) ./$(TARGET) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/icu4c/source/tools/Makefile.in b/icu4c/source/tools/Makefile.in index 0eaddfea629..ff3e984034a 100644 --- a/icu4c/source/tools/Makefile.in +++ b/icu4c/source/tools/Makefile.in @@ -19,7 +19,6 @@ CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/common -I$(top_builddir)/common CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ - @host_frag@ bindir = @bindir@ @@ -46,7 +45,8 @@ endif ICUDATADIR=$(pkgdatadir)/$(VERSION) SRCDATADIR=$(top_srcdir)/../data OBJDATADIR=$(top_builddir)/data -# tmpdir is INSIDE pkgdata dir +# tmpdir is INSIDE pkgdata dir. if you change TMPDATADIR then the invokation +# of pkgdata will break... TMPDATADIR=tmp # DATABUILDDIR must be an absolute path because of the way pkgdata is invoked @@ -55,7 +55,9 @@ TMPDATADIR=tmp DATABUILDDIR=$(shell cd $(OBJDATADIR) && /bin/pwd) # relative lib links from pkgdata are the same as for tmp -PKGDATA=../pkgdata/pkgdata -T . -s $(DATABUILDDIR) -O ./icupkg.inc -d $(DATABUILDDIR) -v -m $(MODE) +top_builddir_from_tmp = $(patsubst ..%,../..%,$(top_builddir)) +INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir_from_tmp)/common:$(top_builddir_from_tmp)/tools/toolutil:$$$(LDLIBRARYPATH_ENVVAR) +PKGDATA = ../pkgdata/pkgdata -T . -s $(DATABUILDDIR) -O ./icupkg.inc -d $(DATABUILDDIR) -v -m $(MODE) ## Install program information mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -196,20 +198,20 @@ $(TMPDATADIR)/icupkg.inc: pkgdata/icupkg.inc build-local build-pkgdata: $(TMPDATADIR)/icudata.lst $(TMPDATADIR)/testdata.lst $(TMPDATADIR)/icupkg.inc $(DATAFILES) @$(mkinstalldirs) $(TMPDATADIR) - (cd $(TMPDATADIR); $(PKGDATA) -p icudata ./icudata.lst ) - (cd $(TMPDATADIR); $(PKGDATA) -p testdat1 ./testdata.lst ) - (cd $(TMPDATADIR); $(PKGDATA) -p testdat2 ./testdata.lst ) + (cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p icudata ./icudata.lst ) + (cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p testdat1 ./testdata.lst ) + (cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p testdat2 ./testdata.lst ) install-pkgdata: $(TMPDATADIR)/icudata.lst $(TMPDATADIR)/icupkg.inc $(mkinstalldirs) $(TMPDATADIR) $(DESTDIR)$(pkgdatadir)/$(VERSION) - (cd $(TMPDATADIR); $(PKGDATA) -p icudata ./icudata.lst -I $(DESTDIR)$(pkgdatadir)/$(VERSION) ) + (cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p icudata ./icudata.lst -I $(DESTDIR)$(pkgdatadir)/$(VERSION) ) clean-pkgdata: @$(mkinstalldirs) $(TMPDATADIR) - -@(cd $(TMPDATADIR); $(PKGDATA) -p icudata ./icudata.lst --clean || echo '### Warning, cannot clean up icu/data if pkgdata is already gone.' ) - -@(cd $(TMPDATADIR); $(PKGDATA) -p testdat1 ./testdata.lst --clean || echo '### Warning, cannot clean up icu/data if pkgdata is already gone.' ) - -@(cd $(TMPDATADIR); $(PKGDATA) -p testdat2 ./testdata.lst --clean || echo '### Warning, cannot clean up icu/data if pkgdata is already gone.' ) + -@(cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p icudata ./icudata.lst --clean || echo '### Warning, cannot clean up icu/data if pkgdata is already gone.' ) + -@(cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p testdat1 ./testdata.lst --clean || echo '### Warning, cannot clean up icu/data if pkgdata is already gone.' ) + -@(cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p testdat2 ./testdata.lst --clean || echo '### Warning, cannot clean up icu/data if pkgdata is already gone.' ) -$(RMV) $(TMPDATADIR)/icudata.lst $(TMPDATADIR)/icupkg.inc check-local: diff --git a/icu4c/source/tools/genccode/Makefile.in b/icu4c/source/tools/genccode/Makefile.in index 445d51e082d..644a8c3e989 100644 --- a/icu4c/source/tools/genccode/Makefile.in +++ b/icu4c/source/tools/genccode/Makefile.in @@ -52,15 +52,17 @@ DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ -LDFLAGS = @LDFLAGS@ \ -$(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) +ENABLE_RPATH = @ENABLE_RPATH@ +ifeq ($(ENABLE_RPATH),YES) +RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) +endif +LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@ $(LIBICU-TOOLUTIL) OBJECTS = genccode.o DEPS = $(OBJECTS:.o=.d) - ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ distclean distclean-local dist dist-local check \ diff --git a/icu4c/source/tools/gencmn/Makefile.in b/icu4c/source/tools/gencmn/Makefile.in index 089475203a8..ac4268b3dca 100644 --- a/icu4c/source/tools/gencmn/Makefile.in +++ b/icu4c/source/tools/gencmn/Makefile.in @@ -60,15 +60,17 @@ DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ -LDFLAGS = @LDFLAGS@ \ -$(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) +ENABLE_RPATH = @ENABLE_RPATH@ +ifeq ($(ENABLE_RPATH),YES) +RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) +endif +LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) LIBS = $(LIBICU-TOOLUTIL) $(LIBICU-UC) @LIBS@ @LIB_M@ OBJECTS = gencmn.o DEPS = $(OBJECTS:.o=.d) - ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ distclean distclean-local dist dist-local check \ diff --git a/icu4c/source/tools/gencnval/Makefile.in b/icu4c/source/tools/gencnval/Makefile.in index 0cbf8a6173f..b44a51a1748 100644 --- a/icu4c/source/tools/gencnval/Makefile.in +++ b/icu4c/source/tools/gencnval/Makefile.in @@ -66,8 +66,12 @@ DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ -LDFLAGS = @LDFLAGS@ \ -$(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) +ENABLE_RPATH = @ENABLE_RPATH@ +ifeq ($(ENABLE_RPATH),YES) +RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) +endif +LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) +INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/tools/toolutil:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICU-TOOLUTIL) $(LIBICU-UC) @LIBS@ @LIB_M@ OBJECTS = gencnval.o @@ -102,7 +106,7 @@ build-data: $(ICUDATADIR)/cnvalias.dat # we set the ICU_DATA directory here so that unames.dat ends up in # icu/data rather than PREFIX/share/icu/VERSION/ $(ICUDATADIR)/cnvalias.dat: $(CONVRTRSFILE) $(TARGET) - ICU_DATA=$(ICUDATADIR) ./$(TARGET) $(CONVRTRSFILE) + ICU_DATA=$(ICUDATADIR) $(INVOKE) ./$(TARGET) $(CONVRTRSFILE) dist-local: diff --git a/icu4c/source/tools/gennames/Makefile.in b/icu4c/source/tools/gennames/Makefile.in index eee96cdb5aa..0acdac366c7 100644 --- a/icu4c/source/tools/gennames/Makefile.in +++ b/icu4c/source/tools/gennames/Makefile.in @@ -59,14 +59,18 @@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ LDFLAGS = @LDFLAGS@ \ -$(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) +ENABLE_RPATH = @ENABLE_RPATH@ +ifeq ($(ENABLE_RPATH),YES) +RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) +endif +LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) +INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/tools/toolutil:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICU-TOOLUTIL) $(LIBICU-UC) @LIBS@ @LIB_M@ OBJECTS = gennames.o DEPS = $(OBJECTS:.o=.d) - ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ distclean distclean-local dist dist-local check \ @@ -92,7 +96,7 @@ install-local: all-local build-data build-data: $(ICUDATADIR)/unames.dat $(ICUDATADIR)/unames.dat: $(UNICODEFILE) $(TARGET) - ./$(TARGET) -d $(ICUDATADIR) $(UNICODEFILE) -u $(UNICODE_VERSION) + $(INVOKE) ./$(TARGET) -d $(ICUDATADIR) $(UNICODEFILE) -u $(UNICODE_VERSION) dist-local: diff --git a/icu4c/source/tools/genprops/Makefile.in b/icu4c/source/tools/genprops/Makefile.in index ec70142ea12..773e0716968 100644 --- a/icu4c/source/tools/genprops/Makefile.in +++ b/icu4c/source/tools/genprops/Makefile.in @@ -57,8 +57,12 @@ DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ -LDFLAGS = @LDFLAGS@ \ -$(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) +ENABLE_RPATH = @ENABLE_RPATH@ +ifeq ($(ENABLE_RPATH),YES) +RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) +endif +LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) +INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/tools/toolutil:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICU-TOOLUTIL) $(LIBICU-UC) @LIBS@ @LIB_M@ OBJECTS = genprops.o store.o @@ -90,7 +94,7 @@ install-local: all-local build-data build-data: $(ICUDATADIR)/uprops.dat $(ICUDATADIR)/uprops.dat: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/Mirror.txt $(TARGET) - ./$(TARGET) -s $(UNICODEDATADIR) -d $(ICUDATADIR) -u $(UNICODE_VERSION) + $(INVOKE) ./$(TARGET) -s $(UNICODEDATADIR) -d $(ICUDATADIR) -u $(UNICODE_VERSION) dist-local: diff --git a/icu4c/source/tools/genrb/Makefile.in b/icu4c/source/tools/genrb/Makefile.in index e4a495c9fdd..97226732328 100644 --- a/icu4c/source/tools/genrb/Makefile.in +++ b/icu4c/source/tools/genrb/Makefile.in @@ -64,8 +64,12 @@ DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/extra/ustdio -I$(srcdir)/../toolutil CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ -LDFLAGS = @LDFLAGS@ \ -$(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) +ENABLE_RPATH = @ENABLE_RPATH@ +ifeq ($(ENABLE_RPATH),YES) +RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) +endif +LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) +INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/i18n:$(top_builddir)/tools/toolutil:$(top_builddir)/extra/ustdio:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBUSTDIO) $(LIBICU-I18N) $(LIBICU-TOOLUTIL) $(LIBICU-UC) @LIBS@ @LIB_M@ ##OBJECTS = error.o genrb.o ustr.o parse.o read.o write.o list.o \ @@ -137,11 +141,11 @@ $(TARGET) : $(OBJECTS) $(top_builddir)/test/testdata/%.res : $(top_srcdir)/test/testdata/%.txt @echo "Creating testdata resource file for $<" - ICU_DATA=$(top_builddir)/data ./genrb -s $(top_srcdir)/test/testdata/ -d $(top_builddir)/test/testdata/ $( $(ECHO_C)" - @./makeconv -d $(top_builddir)/data $< + @$(INVOKE) ./$(TARGET) -d $(top_builddir)/data $< $(top_builddir)/data/%.cnv : $(top_srcdir)/../data/%.ucm $(TARGET) @echo $(ECHO_N) "$< -> $(ECHO_C)" - @./makeconv -d $(top_builddir)/data $< + @$(INVOKE) ./$(TARGET) -d $(top_builddir)/data $< ifeq (,$(MAKECMDGOALS)) -include $(DEPS) diff --git a/icu4c/source/tools/rbdump/Makefile.in b/icu4c/source/tools/rbdump/Makefile.in index 0695933b022..eae296acd75 100644 --- a/icu4c/source/tools/rbdump/Makefile.in +++ b/icu4c/source/tools/rbdump/Makefile.in @@ -50,8 +50,13 @@ DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ +ENABLE_RPATH = @ENABLE_RPATH@ +ifeq ($(ENABLE_RPATH),YES) +RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) +endif +LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) LDFLAGS = @LDFLAGS@ \ -$(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