summaryrefslogtreecommitdiff
path: root/Build/source/libs/icu
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-02-24 08:05:21 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-02-24 08:05:21 +0000
commite75c1ca802e8338ab6601788163bec9bb0591128 (patch)
tree0c82c700aca33a171763c921c9b5eac4d369eb01 /Build/source/libs/icu
parent6c7a45745172cf952ad650c99af32f22411cd454 (diff)
build system: New Makefile fragment to `install' headers in the build tree.
git-svn-id: svn://tug.org/texlive/trunk@25493 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/icu')
-rw-r--r--Build/source/libs/icu/ChangeLog6
-rw-r--r--Build/source/libs/icu/hdrs.am23
-rw-r--r--Build/source/libs/icu/include/Makefile.am8
-rw-r--r--Build/source/libs/icu/include/Makefile.in15
-rw-r--r--Build/source/libs/icu/include/layout/Makefile.am8
-rw-r--r--Build/source/libs/icu/include/layout/Makefile.in15
-rw-r--r--Build/source/libs/icu/include/unicode/Makefile.am9
-rw-r--r--Build/source/libs/icu/include/unicode/Makefile.in16
8 files changed, 44 insertions, 56 deletions
diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog
index 320d1cdb1d7..c59e8216c95 100644
--- a/Build/source/libs/icu/ChangeLog
+++ b/Build/source/libs/icu/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-24 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * include/Makefile.am, include/{layout,unicode/}/Makefile.am:
+ Use ../am/hdr_links.am.
+ * hdrs.am (removed): Obsolete.
+
2011-08-10 Peter Breitenlohner <peb@mppmu.mpg.de>
Adapted to the ICU 4.8.1 distribution.
diff --git a/Build/source/libs/icu/hdrs.am b/Build/source/libs/icu/hdrs.am
deleted file mode 100644
index 6a8260a5be1..00000000000
--- a/Build/source/libs/icu/hdrs.am
+++ /dev/null
@@ -1,23 +0,0 @@
-## libs/icu/hdrs.am: Makefile fragment to create header symlinks.
-##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
-##
-## This file is free software; the copyright holder
-## gives unlimited permission to copy and/or distribute it,
-## with or without modifications, as long as this notice is preserved.
-##
-ICU_SRC = $(top_srcdir)/$(ICU_TREE)
-ICU_BLD = $(top_builddir)/icu-build
-
-all-local:
- @for file in $(ICU_HDRS); do \
- test -f $$file || continue; \
- inst=`echo $$file | sed -e 's/^.*\///'`; \
- test -f $$inst || { \
- echo "$(LN_S) $$file $$inst"; \
- $(LN_S) $$file $$inst; } || exit 1; \
- done
-
-distclean-local:
- rm -f *.h
-
diff --git a/Build/source/libs/icu/include/Makefile.am b/Build/source/libs/icu/include/Makefile.am
index 0718b05716a..08537fd1344 100644
--- a/Build/source/libs/icu/include/Makefile.am
+++ b/Build/source/libs/icu/include/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to install ICU headers for TeX Live.
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -8,9 +8,11 @@
##
SUBDIRS = layout unicode
+ICU_SRC = $(top_srcdir)/$(ICU_TREE)
+
# ICU headers to be installed in include/
-ICU_HDRS = \
+hdr_links = \
$(ICU_SRC)/common/cmemory.h
-include $(top_srcdir)/hdrs.am
+include $(top_srcdir)/../am/hdr_links.am
diff --git a/Build/source/libs/icu/include/Makefile.in b/Build/source/libs/icu/include/Makefile.in
index c16556789c2..3968a750e2b 100644
--- a/Build/source/libs/icu/include/Makefile.in
+++ b/Build/source/libs/icu/include/Makefile.in
@@ -34,7 +34,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/hdrs.am
+ $(top_srcdir)/../am/hdr_links.am
subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -174,17 +174,16 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = layout unicode
+ICU_SRC = $(top_srcdir)/$(ICU_TREE)
# ICU headers to be installed in include/
-ICU_HDRS = \
+hdr_links = \
$(ICU_SRC)/common/cmemory.h
-ICU_SRC = $(top_srcdir)/$(ICU_TREE)
-ICU_BLD = $(top_builddir)/icu-build
all: all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/hdrs.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -205,7 +204,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/hdrs.am:
+$(top_srcdir)/../am/hdr_links.am:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -527,12 +526,12 @@ uninstall-am:
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
tags-recursive uninstall uninstall-am
-
all-local:
- @for file in $(ICU_HDRS); do \
+ @for file in $(hdr_links); do \
test -f $$file || continue; \
inst=`echo $$file | sed -e 's/^.*\///'`; \
test -f $$inst || { \
+ rm -f $$inst; \
echo "$(LN_S) $$file $$inst"; \
$(LN_S) $$file $$inst; } || exit 1; \
done
diff --git a/Build/source/libs/icu/include/layout/Makefile.am b/Build/source/libs/icu/include/layout/Makefile.am
index ce3feb217a4..7dfcb1f09ed 100644
--- a/Build/source/libs/icu/include/layout/Makefile.am
+++ b/Build/source/libs/icu/include/layout/Makefile.am
@@ -1,15 +1,17 @@
## Proxy Makefile.am to install ICU headers for TeX Live.
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
## with or without modifications, as long as this notice is preserved.
##
+ICU_SRC = $(top_srcdir)/$(ICU_TREE)
+
# ICU headers to be installed in include/layout/
-ICU_HDRS = \
+hdr_links = \
$(ICU_SRC)/layout/*.h \
$(ICU_SRC)/layoutex/*.h
-include $(top_srcdir)/hdrs.am
+include $(top_srcdir)/../am/hdr_links.am
diff --git a/Build/source/libs/icu/include/layout/Makefile.in b/Build/source/libs/icu/include/layout/Makefile.in
index e1e45098284..929d5edd09c 100644
--- a/Build/source/libs/icu/include/layout/Makefile.in
+++ b/Build/source/libs/icu/include/layout/Makefile.in
@@ -34,7 +34,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/hdrs.am
+ $(top_srcdir)/../am/hdr_links.am
subdir = include/layout
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -133,18 +133,17 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+ICU_SRC = $(top_srcdir)/$(ICU_TREE)
# ICU headers to be installed in include/layout/
-ICU_HDRS = \
+hdr_links = \
$(ICU_SRC)/layout/*.h \
$(ICU_SRC)/layoutex/*.h
-ICU_SRC = $(top_srcdir)/$(ICU_TREE)
-ICU_BLD = $(top_builddir)/icu-build
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/hdrs.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -165,7 +164,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/hdrs.am:
+$(top_srcdir)/../am/hdr_links.am:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -325,12 +324,12 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am
-
all-local:
- @for file in $(ICU_HDRS); do \
+ @for file in $(hdr_links); do \
test -f $$file || continue; \
inst=`echo $$file | sed -e 's/^.*\///'`; \
test -f $$inst || { \
+ rm -f $$inst; \
echo "$(LN_S) $$file $$inst"; \
$(LN_S) $$file $$inst; } || exit 1; \
done
diff --git a/Build/source/libs/icu/include/unicode/Makefile.am b/Build/source/libs/icu/include/unicode/Makefile.am
index 48d3d78df00..551cf5e211f 100644
--- a/Build/source/libs/icu/include/unicode/Makefile.am
+++ b/Build/source/libs/icu/include/unicode/Makefile.am
@@ -1,17 +1,20 @@
## Proxy Makefile.am to install ICU headers for TeX Live.
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
## with or without modifications, as long as this notice is preserved.
##
+ICU_BLD = $(top_builddir)/icu-build
+ICU_SRC = $(top_srcdir)/$(ICU_TREE)
+
# ICU headers to be installed in include/unicode/
-ICU_HDRS = \
+hdr_links = \
$(ICU_BLD)/common/unicode/*.h \
$(ICU_SRC)/common/unicode/*.h \
$(ICU_SRC)/i18n/unicode/*.h \
$(ICU_SRC)/io/unicode/*.h
-include $(top_srcdir)/hdrs.am
+include $(top_srcdir)/../am/hdr_links.am
diff --git a/Build/source/libs/icu/include/unicode/Makefile.in b/Build/source/libs/icu/include/unicode/Makefile.in
index b7bc2f2a12d..35142e3c8bd 100644
--- a/Build/source/libs/icu/include/unicode/Makefile.in
+++ b/Build/source/libs/icu/include/unicode/Makefile.in
@@ -34,7 +34,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/hdrs.am
+ $(top_srcdir)/../am/hdr_links.am
subdir = include/unicode
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -133,20 +133,20 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+ICU_BLD = $(top_builddir)/icu-build
+ICU_SRC = $(top_srcdir)/$(ICU_TREE)
# ICU headers to be installed in include/unicode/
-ICU_HDRS = \
+hdr_links = \
$(ICU_BLD)/common/unicode/*.h \
$(ICU_SRC)/common/unicode/*.h \
$(ICU_SRC)/i18n/unicode/*.h \
$(ICU_SRC)/io/unicode/*.h
-ICU_SRC = $(top_srcdir)/$(ICU_TREE)
-ICU_BLD = $(top_builddir)/icu-build
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/hdrs.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -167,7 +167,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/hdrs.am:
+$(top_srcdir)/../am/hdr_links.am:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -327,12 +327,12 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am
-
all-local:
- @for file in $(ICU_HDRS); do \
+ @for file in $(hdr_links); do \
test -f $$file || continue; \
inst=`echo $$file | sed -e 's/^.*\///'`; \
test -f $$inst || { \
+ rm -f $$inst; \
echo "$(LN_S) $$file $$inst"; \
$(LN_S) $$file $$inst; } || exit 1; \
done