ICU-692 make it work out of source, please...

X-SVN-Rev: 2801
2000-10-26 19:28:33 +00:00 · 2000-10-26 19:28:33 +00:00 · c27ba65a7c
commit c27ba65a7c
parent 91a6c7c3fa
30 changed files with 93 additions and 63 deletions
--- 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
--- 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'
--- 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
--- 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
--- 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'
--- 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'
--- 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
--- 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)
--- 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'
--- 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'
--- 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'
--- 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'
--- 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'
--- 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'
--- 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
--- 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'
--- 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
--- 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'
--- 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'
--- 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'
--- 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

 ##
--- 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/
--- 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
--- 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'
--- 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

 ##
--- 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

 ## 
--- 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'
--- 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'
--- 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'
--- 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'