diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-20 09:15:29 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-20 09:15:29 +0000 |
commit | ac005f402389542b123fd41fd9fc54322f3becf1 (patch) | |
tree | 6234c1b385dd10b6716c676108ecf68856ea7480 /Build/source/libs/icu | |
parent | 9301a1dd22ac8cedf4f7f980c96ef9e4f2bd37c2 (diff) |
somewhat reorganize libs build system
git-svn-id: svn://tug.org/texlive/trunk@16091 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/icu')
-rw-r--r-- | Build/source/libs/icu/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/libs/icu/Makefile.in | 6 | ||||
-rwxr-xr-x | Build/source/libs/icu/configure | 8 | ||||
-rw-r--r-- | Build/source/libs/icu/configure.ac | 2 | ||||
-rw-r--r-- | Build/source/libs/icu/include/Makefile.am (renamed from Build/source/libs/icu/icu-incl/Makefile.am) | 2 | ||||
-rw-r--r-- | Build/source/libs/icu/include/Makefile.in (renamed from Build/source/libs/icu/icu-incl/Makefile.in) | 8 | ||||
-rw-r--r-- | Build/source/libs/icu/include/layout/Makefile.am (renamed from Build/source/libs/icu/icu-incl/layout/Makefile.am) | 2 | ||||
-rw-r--r-- | Build/source/libs/icu/include/layout/Makefile.in (renamed from Build/source/libs/icu/icu-incl/layout/Makefile.in) | 8 | ||||
-rw-r--r-- | Build/source/libs/icu/include/unicode/Makefile.am (renamed from Build/source/libs/icu/icu-incl/unicode/Makefile.am) | 2 | ||||
-rw-r--r-- | Build/source/libs/icu/include/unicode/Makefile.in (renamed from Build/source/libs/icu/icu-incl/unicode/Makefile.in) | 8 |
10 files changed, 25 insertions, 25 deletions
diff --git a/Build/source/libs/icu/Makefile.am b/Build/source/libs/icu/Makefile.am index 43f034d035d..e52e08094e1 100644 --- a/Build/source/libs/icu/Makefile.am +++ b/Build/source/libs/icu/Makefile.am @@ -11,7 +11,7 @@ ACLOCAL_AMFLAGS = -I ../../m4 # Rebuild .PHONY: rebuild rebuild: icubuild - cd icu-incl && $(MAKE) $(AM_MAKEFLAGS) all + cd include && $(MAKE) $(AM_MAKEFLAGS) all SUBDIRS = . @@ -30,7 +30,7 @@ dist-hook: if build all-local: icubuild -SUBDIRS += icu-incl +SUBDIRS += include else !build all-local: icu-build/Makefile endif !build diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in index 0036d8d020b..42c03ee6c4c 100644 --- a/Build/source/libs/icu/Makefile.in +++ b/Build/source/libs/icu/Makefile.in @@ -33,7 +33,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@build_TRUE@am__append_1 = icu-incl +@build_TRUE@am__append_1 = include subdir = . DIST_COMMON = README $(am__configure_deps) \ $(srcdir)/../../build-aux/config.guess \ @@ -73,7 +73,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = . icu-incl +DIST_SUBDIRS = . include DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -673,7 +673,7 @@ uninstall-am: # Rebuild .PHONY: rebuild rebuild: icubuild - cd icu-incl && $(MAKE) $(AM_MAKEFLAGS) all + cd include && $(MAKE) $(AM_MAKEFLAGS) all # in case of an SVN repository dist-hook: diff --git a/Build/source/libs/icu/configure b/Build/source/libs/icu/configure index 578a415c701..d3d39cf4227 100755 --- a/Build/source/libs/icu/configure +++ b/Build/source/libs/icu/configure @@ -2369,7 +2369,7 @@ done -ac_config_files="$ac_config_files Makefile icu-incl/Makefile icu-incl/unicode/Makefile icu-incl/layout/Makefile" +ac_config_files="$ac_config_files Makefile include/Makefile include/unicode/Makefile include/layout/Makefile" cat >confcache <<\_ACEOF @@ -3083,9 +3083,9 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "icu-incl/Makefile") CONFIG_FILES="$CONFIG_FILES icu-incl/Makefile" ;; - "icu-incl/unicode/Makefile") CONFIG_FILES="$CONFIG_FILES icu-incl/unicode/Makefile" ;; - "icu-incl/layout/Makefile") CONFIG_FILES="$CONFIG_FILES icu-incl/layout/Makefile" ;; + "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; + "include/unicode/Makefile") CONFIG_FILES="$CONFIG_FILES include/unicode/Makefile" ;; + "include/layout/Makefile") CONFIG_FILES="$CONFIG_FILES include/layout/Makefile" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/Build/source/libs/icu/configure.ac b/Build/source/libs/icu/configure.ac index 93f7a0fd6f2..ae3bbec49d0 100644 --- a/Build/source/libs/icu/configure.ac +++ b/Build/source/libs/icu/configure.ac @@ -62,6 +62,6 @@ done AC_SUBST([icu_build_args]) AC_SUBST([icu_native_args]) -AC_CONFIG_FILES([Makefile icu-incl/Makefile icu-incl/unicode/Makefile icu-incl/layout/Makefile]) +AC_CONFIG_FILES([Makefile include/Makefile include/unicode/Makefile include/layout/Makefile]) AC_OUTPUT diff --git a/Build/source/libs/icu/icu-incl/Makefile.am b/Build/source/libs/icu/include/Makefile.am index 52cd0f04ac6..0718b05716a 100644 --- a/Build/source/libs/icu/icu-incl/Makefile.am +++ b/Build/source/libs/icu/include/Makefile.am @@ -8,7 +8,7 @@ ## SUBDIRS = layout unicode -# ICU headers to be installed in icu-incl/ +# ICU headers to be installed in include/ ICU_HDRS = \ $(ICU_SRC)/common/cmemory.h diff --git a/Build/source/libs/icu/icu-incl/Makefile.in b/Build/source/libs/icu/include/Makefile.in index 5c5e46a9051..79fa9518f69 100644 --- a/Build/source/libs/icu/icu-incl/Makefile.in +++ b/Build/source/libs/icu/include/Makefile.in @@ -35,7 +35,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/hdrs.am -subdir = icu-incl +subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/configure.ac @@ -175,7 +175,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = layout unicode -# ICU headers to be installed in icu-incl/ +# ICU headers to be installed in include/ ICU_HDRS = \ $(ICU_SRC)/common/cmemory.h @@ -193,9 +193,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign icu-incl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign icu-incl/Makefile + $(AUTOMAKE) --foreign include/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/Build/source/libs/icu/icu-incl/layout/Makefile.am b/Build/source/libs/icu/include/layout/Makefile.am index 18257a84656..ce3feb217a4 100644 --- a/Build/source/libs/icu/icu-incl/layout/Makefile.am +++ b/Build/source/libs/icu/include/layout/Makefile.am @@ -6,7 +6,7 @@ ## gives unlimited permission to copy and/or distribute it, ## with or without modifications, as long as this notice is preserved. ## -# ICU headers to be installed in icu-incl/layout/ +# ICU headers to be installed in include/layout/ ICU_HDRS = \ $(ICU_SRC)/layout/*.h \ $(ICU_SRC)/layoutex/*.h diff --git a/Build/source/libs/icu/icu-incl/layout/Makefile.in b/Build/source/libs/icu/include/layout/Makefile.in index dc85960939a..f796e9b41b6 100644 --- a/Build/source/libs/icu/icu-incl/layout/Makefile.in +++ b/Build/source/libs/icu/include/layout/Makefile.in @@ -35,7 +35,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/hdrs.am -subdir = icu-incl/layout +subdir = include/layout ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/configure.ac @@ -134,7 +134,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -# ICU headers to be installed in icu-incl/layout/ +# ICU headers to be installed in include/layout/ ICU_HDRS = \ $(ICU_SRC)/layout/*.h \ $(ICU_SRC)/layoutex/*.h @@ -153,9 +153,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign icu-incl/layout/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/layout/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign icu-incl/layout/Makefile + $(AUTOMAKE) --foreign include/layout/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/Build/source/libs/icu/icu-incl/unicode/Makefile.am b/Build/source/libs/icu/include/unicode/Makefile.am index 294cbed1bd1..48d3d78df00 100644 --- a/Build/source/libs/icu/icu-incl/unicode/Makefile.am +++ b/Build/source/libs/icu/include/unicode/Makefile.am @@ -6,7 +6,7 @@ ## gives unlimited permission to copy and/or distribute it, ## with or without modifications, as long as this notice is preserved. ## -# ICU headers to be installed in icu-incl/unicode/ +# ICU headers to be installed in include/unicode/ ICU_HDRS = \ $(ICU_BLD)/common/unicode/*.h \ $(ICU_SRC)/common/unicode/*.h \ diff --git a/Build/source/libs/icu/icu-incl/unicode/Makefile.in b/Build/source/libs/icu/include/unicode/Makefile.in index cc67bbff022..a0fe6f9c79a 100644 --- a/Build/source/libs/icu/icu-incl/unicode/Makefile.in +++ b/Build/source/libs/icu/include/unicode/Makefile.in @@ -35,7 +35,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/hdrs.am -subdir = icu-incl/unicode +subdir = include/unicode ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/configure.ac @@ -134,7 +134,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -# ICU headers to be installed in icu-incl/unicode/ +# ICU headers to be installed in include/unicode/ ICU_HDRS = \ $(ICU_BLD)/common/unicode/*.h \ $(ICU_SRC)/common/unicode/*.h \ @@ -155,9 +155,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign icu-incl/unicode/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/unicode/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign icu-incl/unicode/Makefile + $(AUTOMAKE) --foreign include/unicode/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ |