From c27ba65a7c7ac976cf8dde08dcce3488701d9f11 Mon Sep 17 00:00:00 2001 From: Yves Arrouye Date: Thu, 26 Oct 2000 19:28:33 +0000 Subject: [PATCH] ICU-692 make it work out of source, please... X-SVN-Rev: 2801 --- icu4c/source/Makefile.in | 11 ++++++----- icu4c/source/common/Makefile.in | 5 +++-- icu4c/source/data/Makefile.in | 5 +++-- icu4c/source/extra/Makefile.in | 5 +++-- icu4c/source/extra/ustdio/Makefile.in | 5 +++-- icu4c/source/i18n/Makefile.in | 5 +++-- icu4c/source/samples/Makefile.in | 5 +++-- icu4c/source/samples/XMLConverter/Makefile.in | 5 +++-- icu4c/source/samples/cal/Makefile.in | 5 +++-- icu4c/source/samples/date/Makefile.in | 5 +++-- icu4c/source/test/Makefile.in | 5 +++-- icu4c/source/test/cintltst/Makefile.in | 5 +++-- icu4c/source/test/ieeetest/Makefile.in | 5 +++-- icu4c/source/test/intltest/Makefile.in | 5 +++-- icu4c/source/test/testdata/Makefile.in | 5 +++-- icu4c/source/test/testmap/Makefile.in | 5 +++-- icu4c/source/tools/Makefile.in | 5 +++-- icu4c/source/tools/ctestfw/Makefile.in | 5 +++-- icu4c/source/tools/genccode/Makefile.in | 5 +++-- icu4c/source/tools/gencmn/Makefile.in | 5 +++-- icu4c/source/tools/gencnval/Makefile.in | 5 +++-- icu4c/source/tools/gennames/Makefile.in | 5 +++-- icu4c/source/tools/genprops/Makefile.in | 5 +++-- icu4c/source/tools/genrb/Makefile.in | 5 +++-- icu4c/source/tools/gentest/Makefile.in | 5 +++-- icu4c/source/tools/gentz/Makefile.in | 5 +++-- icu4c/source/tools/makeconv/Makefile.in | 5 +++-- icu4c/source/tools/pkgdata/Makefile.in | 5 +++-- icu4c/source/tools/rbdump/Makefile.in | 5 +++-- icu4c/source/tools/toolutil/Makefile.in | 5 +++-- 30 files changed, 93 insertions(+), 63 deletions(-) diff --git a/icu4c/source/Makefile.in b/icu4c/source/Makefile.in index 24ce20a0a9..b4ad004216 100644 --- a/icu4c/source/Makefile.in +++ b/icu4c/source/Makefile.in @@ -10,14 +10,15 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk - -## Build directory information top_builddir = . -subdir = . + +include $(top_builddir)/icudefs.mk ## +## Build directory information +subdir = . + AUTOCONF = @AUTOCONF@ ## Platform-specific setup @@ -114,7 +115,7 @@ clean-local: test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES) distclean-local: clean-local - $(RMV) Makefile icudefs.mk config/Makefile + $(RMV) Makefile README icudefs.mk config/Makefile $(RMV) $(top_builddir)/config/Makefile.inc $(RMV) config.cache config.log config.status $(RMV) common/unicode/platform.h common/icucfg.h diff --git a/icu4c/source/common/Makefile.in b/icu4c/source/common/Makefile.in index bd78cec31d..abfef41564 100644 --- a/icu4c/source/common/Makefile.in +++ b/icu4c/source/common/Makefile.in @@ -14,13 +14,14 @@ SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = .. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = .. subdir = common ## Extra files to remove for 'make clean' diff --git a/icu4c/source/data/Makefile.in b/icu4c/source/data/Makefile.in index 204bf4269e..ba08ad0be5 100644 --- a/icu4c/source/data/Makefile.in +++ b/icu4c/source/data/Makefile.in @@ -11,10 +11,11 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = .. + +include $(top_builddir)/icudefs.mk ## Build directory information -top_builddir = .. subdir = data ## Platform-specific setup diff --git a/icu4c/source/extra/Makefile.in b/icu4c/source/extra/Makefile.in index 0b62b2374b..de75826b2f 100644 --- a/icu4c/source/extra/Makefile.in +++ b/icu4c/source/extra/Makefile.in @@ -11,10 +11,11 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = .. + +include $(top_builddir)/icudefs.mk ## Build directory information -top_builddir = .. subdir = extra ## Platform-specific setup diff --git a/icu4c/source/extra/ustdio/Makefile.in b/icu4c/source/extra/ustdio/Makefile.in index 0ebad1d561..85c3dea9af 100644 --- a/icu4c/source/extra/ustdio/Makefile.in +++ b/icu4c/source/extra/ustdio/Makefile.in @@ -14,13 +14,14 @@ SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = extra/ustdio ## Extra files to remove for 'make clean' diff --git a/icu4c/source/i18n/Makefile.in b/icu4c/source/i18n/Makefile.in index 54e637d109..5ea864babf 100644 --- a/icu4c/source/i18n/Makefile.in +++ b/icu4c/source/i18n/Makefile.in @@ -8,13 +8,14 @@ SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = .. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = .. subdir = i18n ## Extra files to remove for 'make clean' diff --git a/icu4c/source/samples/Makefile.in b/icu4c/source/samples/Makefile.in index c45ff3543f..1a211dab1c 100644 --- a/icu4c/source/samples/Makefile.in +++ b/icu4c/source/samples/Makefile.in @@ -6,10 +6,11 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = .. + +include $(top_builddir)/icudefs.mk ## Build directory information -top_builddir = .. subdir = samples ## Platform-specific setup diff --git a/icu4c/source/samples/XMLConverter/Makefile.in b/icu4c/source/samples/XMLConverter/Makefile.in index cd44e95d22..3dad54b722 100644 --- a/icu4c/source/samples/XMLConverter/Makefile.in +++ b/icu4c/source/samples/XMLConverter/Makefile.in @@ -6,13 +6,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = samples/XMLConverter ## Extra files to remove for 'make clean' CLEANFILES = *~ $(DEPS) diff --git a/icu4c/source/samples/cal/Makefile.in b/icu4c/source/samples/cal/Makefile.in index e7bdbdc94a..12cfd7c3be 100644 --- a/icu4c/source/samples/cal/Makefile.in +++ b/icu4c/source/samples/cal/Makefile.in @@ -6,13 +6,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = samples/cal ## Extra files to remove for 'make clean' diff --git a/icu4c/source/samples/date/Makefile.in b/icu4c/source/samples/date/Makefile.in index 80d6eed470..779e457885 100644 --- a/icu4c/source/samples/date/Makefile.in +++ b/icu4c/source/samples/date/Makefile.in @@ -6,13 +6,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = samples/date ## Extra files to remove for 'make clean' diff --git a/icu4c/source/test/Makefile.in b/icu4c/source/test/Makefile.in index 32fce81537..3ad6ca82b7 100644 --- a/icu4c/source/test/Makefile.in +++ b/icu4c/source/test/Makefile.in @@ -6,13 +6,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = .. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = .. subdir = test ## Files to remove for 'make clean' diff --git a/icu4c/source/test/cintltst/Makefile.in b/icu4c/source/test/cintltst/Makefile.in index d4feb9cf20..153f43e091 100644 --- a/icu4c/source/test/cintltst/Makefile.in +++ b/icu4c/source/test/cintltst/Makefile.in @@ -6,13 +6,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = test/cintltst ## Extra files to remove for 'make clean' diff --git a/icu4c/source/test/ieeetest/Makefile.in b/icu4c/source/test/ieeetest/Makefile.in index b392692fc4..2c3c152059 100644 --- a/icu4c/source/test/ieeetest/Makefile.in +++ b/icu4c/source/test/ieeetest/Makefile.in @@ -6,13 +6,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = test/ieeetest ## Extra files to remove for 'make clean' diff --git a/icu4c/source/test/intltest/Makefile.in b/icu4c/source/test/intltest/Makefile.in index 81f5b8c304..947408b81b 100644 --- a/icu4c/source/test/intltest/Makefile.in +++ b/icu4c/source/test/intltest/Makefile.in @@ -6,13 +6,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = test/intltest ## Extra files to remove for 'make clean' diff --git a/icu4c/source/test/testdata/Makefile.in b/icu4c/source/test/testdata/Makefile.in index 3e95b30833..9246b92604 100644 --- a/icu4c/source/test/testdata/Makefile.in +++ b/icu4c/source/test/testdata/Makefile.in @@ -11,13 +11,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = test/testdata ## Optional directory setup diff --git a/icu4c/source/test/testmap/Makefile.in b/icu4c/source/test/testmap/Makefile.in index 52b52bfe6e..6ef539ede0 100644 --- a/icu4c/source/test/testmap/Makefile.in +++ b/icu4c/source/test/testmap/Makefile.in @@ -6,13 +6,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = test/testmap ## Extra files to remove for 'make clean' diff --git a/icu4c/source/tools/Makefile.in b/icu4c/source/tools/Makefile.in index b1c2cfc78b..c7cc0d9819 100644 --- a/icu4c/source/tools/Makefile.in +++ b/icu4c/source/tools/Makefile.in @@ -6,7 +6,9 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = .. + +include $(top_builddir)/icudefs.mk include @platform_make_fragment@ @@ -17,7 +19,6 @@ CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ ## Build directory information -top_builddir = .. subdir = tools ## Allow overriding of package build mode diff --git a/icu4c/source/tools/ctestfw/Makefile.in b/icu4c/source/tools/ctestfw/Makefile.in index b2f7393529..506917be2f 100644 --- a/icu4c/source/tools/ctestfw/Makefile.in +++ b/icu4c/source/tools/ctestfw/Makefile.in @@ -7,13 +7,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = tools/ctestfw ## Extra files to remove for 'make clean' diff --git a/icu4c/source/tools/genccode/Makefile.in b/icu4c/source/tools/genccode/Makefile.in index c97f2a3f4c..fef4c3f19a 100644 --- a/icu4c/source/tools/genccode/Makefile.in +++ b/icu4c/source/tools/genccode/Makefile.in @@ -7,13 +7,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = tools/genccode ## Extra files to remove for 'make clean' diff --git a/icu4c/source/tools/gencmn/Makefile.in b/icu4c/source/tools/gencmn/Makefile.in index 95a52fec94..ff7adb51d7 100644 --- a/icu4c/source/tools/gencmn/Makefile.in +++ b/icu4c/source/tools/gencmn/Makefile.in @@ -7,13 +7,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = tools/gencmn ## Extra files to remove for 'make clean' diff --git a/icu4c/source/tools/gencnval/Makefile.in b/icu4c/source/tools/gencnval/Makefile.in index c58ca54bb7..1d5d6efbef 100644 --- a/icu4c/source/tools/gencnval/Makefile.in +++ b/icu4c/source/tools/gencnval/Makefile.in @@ -7,13 +7,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = tools/gencnval ## diff --git a/icu4c/source/tools/gennames/Makefile.in b/icu4c/source/tools/gennames/Makefile.in index ddbf70c947..19d3fb8161 100644 --- a/icu4c/source/tools/gennames/Makefile.in +++ b/icu4c/source/tools/gennames/Makefile.in @@ -7,13 +7,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = tools/gennames ICUDATADIR=$(top_builddir)/data/ diff --git a/icu4c/source/tools/genprops/Makefile.in b/icu4c/source/tools/genprops/Makefile.in index dce54ea4a1..2f23ef77ca 100644 --- a/icu4c/source/tools/genprops/Makefile.in +++ b/icu4c/source/tools/genprops/Makefile.in @@ -7,7 +7,9 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ @@ -15,7 +17,6 @@ include @platform_make_fragment@ ## ## Build directory information -top_builddir = ../.. subdir = tools/genprops ICUDATADIR=$(top_builddir)/data diff --git a/icu4c/source/tools/genrb/Makefile.in b/icu4c/source/tools/genrb/Makefile.in index 33c80aaa88..8f17d69fa8 100644 --- a/icu4c/source/tools/genrb/Makefile.in +++ b/icu4c/source/tools/genrb/Makefile.in @@ -6,7 +6,9 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup @@ -19,7 +21,6 @@ SECTION = 8 MAN_FILES = $(TARGET).$(SECTION) ## Build directory information -top_builddir = ../.. subdir = tools/genrb ## Extra files to remove for 'make clean' diff --git a/icu4c/source/tools/gentest/Makefile.in b/icu4c/source/tools/gentest/Makefile.in index 3aa0f31c3a..5a39a7ca80 100644 --- a/icu4c/source/tools/gentest/Makefile.in +++ b/icu4c/source/tools/gentest/Makefile.in @@ -8,13 +8,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = tools/gentest ## diff --git a/icu4c/source/tools/gentz/Makefile.in b/icu4c/source/tools/gentz/Makefile.in index d7ba75dfa6..433a45e56a 100644 --- a/icu4c/source/tools/gentz/Makefile.in +++ b/icu4c/source/tools/gentz/Makefile.in @@ -7,13 +7,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = tools/gentz ## diff --git a/icu4c/source/tools/makeconv/Makefile.in b/icu4c/source/tools/makeconv/Makefile.in index 90c45d0425..23c49449fc 100644 --- a/icu4c/source/tools/makeconv/Makefile.in +++ b/icu4c/source/tools/makeconv/Makefile.in @@ -5,7 +5,9 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ @@ -25,7 +27,6 @@ include $(srcdir)/ucmfiles.mk -include $(srcdir)/ucmlocal.mk ## Build directory information -top_builddir = ../.. subdir = tools/makeconv ## Extra files to remove for 'make clean' diff --git a/icu4c/source/tools/pkgdata/Makefile.in b/icu4c/source/tools/pkgdata/Makefile.in index 0bebeef736..ef80c87052 100644 --- a/icu4c/source/tools/pkgdata/Makefile.in +++ b/icu4c/source/tools/pkgdata/Makefile.in @@ -7,13 +7,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = tools/pkgdata ## Extra files to remove for 'make clean' diff --git a/icu4c/source/tools/rbdump/Makefile.in b/icu4c/source/tools/rbdump/Makefile.in index fb49d0d7cd..17ee716322 100644 --- a/icu4c/source/tools/rbdump/Makefile.in +++ b/icu4c/source/tools/rbdump/Makefile.in @@ -5,13 +5,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = tools/rbdump ## Extra files to remove for 'make clean' diff --git a/icu4c/source/tools/toolutil/Makefile.in b/icu4c/source/tools/toolutil/Makefile.in index 8daea2f24c..a06d2c60e8 100644 --- a/icu4c/source/tools/toolutil/Makefile.in +++ b/icu4c/source/tools/toolutil/Makefile.in @@ -8,13 +8,14 @@ SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -include $(top_srcdir)/icudefs.mk +top_builddir = ../.. + +include $(top_builddir)/icudefs.mk ## Platform-specific setup include @platform_make_fragment@ ## Build directory information -top_builddir = ../.. subdir = tools/toolutil ## Extra files to remove for 'make clean'