towards TL2010: libs/icu

git-svn-id: svn://tug.org/texlive/trunk@15954 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 53 insertions, 17 deletions

diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in
index 5ecbbaac484..9551000c8ee 100644
--- a/Build/source/libs/icu/Makefile.in
+++ b/Build/source/libs/icu/Makefile.in
@@ -32,8 +32,13 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@build_TRUE@am__append_1 = icu-incl
 subdir = .
-DIST_COMMON = $(am__configure_deps) \
+DIST_COMMON = README $(am__configure_deps) \
+	$(srcdir)/../../build-aux/config.guess \
+	$(srcdir)/../../build-aux/config.sub \
 	$(srcdir)/../../build-aux/install-sh \
 	$(srcdir)/../../build-aux/missing \
 	$(srcdir)/../../build-aux/mkinstalldirs $(srcdir)/Makefile.am \
@@ -42,9 +47,10 @@ DIST_COMMON = $(am__configure_deps) \
 	../../build-aux/depcomp ../../build-aux/install-sh \
 	../../build-aux/ltmain.sh ../../build-aux/missing \
 	../../build-aux/mkinstalldirs ../../build-aux/texinfo.tex \
-	../../build-aux/ylwrap
+	../../build-aux/ylwrap ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -69,7 +75,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = dummy . icu-incl
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -102,7 +108,7 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
@@ -117,6 +123,7 @@ DEFS = @DEFS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+ICU_TREE = @ICU_TREE@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -124,6 +131,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -133,6 +141,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
@@ -147,14 +156,22 @@ am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
@@ -180,11 +197,12 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
-SUBDIRS = dummy
-EXTRA_DIST = icu-xetex
+SUBDIRS = dummy . $(am__append_1)
+EXTRA_DIST = $(ICU_TREE) license.html $(ICU_TREE)-PATCHES
 ICUSUB_AUX = icusubdir-configure icusubdir-conf.args
 noinst_DATA = $(ICUSUB_AUX)
-DISTCLEANFILES = $(noinst_DATA)
+DISTCLEANFILES = $(noinst_DATA) icu-build.args icu-native.args
+@cross_TRUE@ICU_NATIVE = icu-native/config/icucross.mk
 all: all-recursive
 
 .SUFFIXES:
@@ -430,6 +448,7 @@ distdir: $(DISTFILES)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
+
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
@@ -457,7 +476,6 @@ dist-zip: distdir
 
 dist dist-all: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -656,24 +674,43 @@ uninstall-am:
 	uninstall uninstall-am
 
 
+# Rebuild
+.PHONY: rebuild
+rebuild: icubuild
+	cd icu-incl && $(MAKE) $(AM_MAKEFLAGS) all
+
 # in case of an SVN repository
 dist-hook:
-	rm -rf `find $(distdir)/icu-xetex -name .svn`
+	rm -rf `find $(distdir) -name .svn`
 
 @build_TRUE@all-local: icubuild
 @build_FALSE@all-local: icu-build/Makefile
 
-icu-build/Makefile: $(noinst_DATA)
+icu-build/Makefile: $(ICUSUB_AUX) icu-build.args $(ICU_NATIVE)
 	$(mkdir_p) icu-build
-	@cmd=`cat $(ICUSUB_AUX)`; \
-	cmd="$$cmd --enable-static --disable-shared --disable-extras --disable-samples --disable-tests"; \
+	@cmd=`cat $(ICUSUB_AUX) icu-build.args | sed 's,ICUSUBDIR,$(ICU_TREE),g'`; \
 	(cd icu-build && echo "=== configuring in icu-build (`pwd`)" && \
 	  echo "make: running $(SHELL) $$cmd" && \
+	  CONFIG_SHELL=$(SHELL) && export CONFIG_SHELL && \
+	  eval $(SHELL) $$cmd)
+
+icu-native/config/icucross.mk: icu-native/Makefile
+	cd icu-native && $(MAKE) $(AM_MAKEFLAGS) config/icucross.mk
+
+icu-native/Makefile: $(ICUSUB_AUX) icu-native.args
+	$(mkdir_p) icu-native
+	@cmd=`cat $(ICUSUB_AUX) icu-native.args | sed 's,ICUSUBDIR,$(ICU_TREE),g'`; \
+	(cd icu-native && echo "=== configuring in icu-native (`pwd`)" && \
+	  echo "make: running $(SHELL) $$cmd" && \
+	  CONFIG_SHELL=$(SHELL) && export CONFIG_SHELL && \
 	  eval $(SHELL) $$cmd)
 
 .PHONY: icubuild check-makeflags
+
 icubuild: icu-build/Makefile check-makeflags
+@cross_TRUE@	cd icu-native && $(MAKE) $(AM_MAKEFLAGS) all
 	cd icu-build && $(MAKE) $(AM_MAKEFLAGS) all
+
 check-makeflags:
 	@for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -684,13 +721,12 @@ check-makeflags:
 	done
 
 distclean-local:
-	rm -rf icu-build
+	rm -rf icu-build icu-native
 
 icusubdir-configure:
-	@echo "make in ./dummy failed to create the file $@"
-	exit 1
+	cd dummy && $(MAKE) $(AM_MAKEFLAGS) ../$@
 
-icusubdir-conf.args:
+icusubdir-conf.args icu-build.args icu-native.args:
 	@echo "configure in ./dummy failed to create the file $@"
 	exit 1