ICU_EXTRA_LIBS for icutest; doc

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

9 files changed, 27 insertions, 12 deletions

diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog
index 2d09a6331e2..d9bbbaee961 100644
--- a/Build/source/libs/harfbuzz/ChangeLog
+++ b/Build/source/libs/harfbuzz/ChangeLog
@@ -1,3 +1,7 @@
+2017-04-27  Karl Berry  <karl@tug.org>
+
+	* Makefile.am (LDADD): add $(ICU_LIBS_EXTRA).
+
 2017-04-24  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	Import harfbuzz-1.4.6.
diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog
index 2d64ed9a2c1..196187e7fd6 100644
--- a/Build/source/libs/icu/ChangeLog
+++ b/Build/source/libs/icu/ChangeLog
@@ -1,3 +1,7 @@
+2017-04-27  Karl Berry  <karl@tug.org>
+
+	* Makefile.am (LDADD): link icutest with ICU_LIBS_EXTRA.
+
 2017-03-13  Karl Berry  <karl@freefriends.org>
 
 	* Import icu-58.2 (release); reautoconf.
@@ -195,4 +199,3 @@
 2009-01-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Adapt to TL2009 build system.
-
diff --git a/Build/source/libs/icu/Makefile.am b/Build/source/libs/icu/Makefile.am
index d96452f44cc..97feca96864 100644
--- a/Build/source/libs/icu/Makefile.am
+++ b/Build/source/libs/icu/Makefile.am
@@ -84,7 +84,7 @@ nodist_EXTRA_icutest_SOURCES = dummy.cxx
 
 icutest_CPPFLAGS = -Iinclude
 
-LDADD = icu-build/lib/libicuuc.a icu-build/lib/libicudata.a
+LDADD = icu-build/lib/libicuuc.a icu-build/lib/libicudata.a $(ICU_LIBS_EXTRA)
 
 # Rebuild
 rebuild_prereq =
@@ -92,4 +92,3 @@ rebuild_target = icubuild
 CLEANFILES =
 
 include $(srcdir)/../../am/rebuild.am
-
diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in
index 882054d6d97..04ec504345c 100644
--- a/Build/source/libs/icu/Makefile.in
+++ b/Build/source/libs/icu/Makefile.in
@@ -576,7 +576,7 @@ icutest_SOURCES = icutest.c
 # Force Automake to use CXXLD for linking
 nodist_EXTRA_icutest_SOURCES = dummy.cxx
 icutest_CPPFLAGS = -Iinclude
-LDADD = icu-build/lib/libicuuc.a icu-build/lib/libicudata.a
+LDADD = icu-build/lib/libicuuc.a icu-build/lib/libicudata.a $(ICU_LIBS_EXTRA)
 
 # Rebuild
 rebuild_prereq = 
diff --git a/Build/source/texk/bibtex-x/ChangeLog b/Build/source/texk/bibtex-x/ChangeLog
index bfc856986c9..3b5b76f0871 100644
--- a/Build/source/texk/bibtex-x/ChangeLog
+++ b/Build/source/texk/bibtex-x/ChangeLog
@@ -1,3 +1,7 @@
+2017-04-27  Karl Berry  <karl@tug.org>
+
+	* Makefile.am (bibtexu_LDADD): add $(ICU_LIBS_EXTRA).
+
 2015-07-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Better dependencies for 'make check'.
@@ -327,4 +331,3 @@
 
 	* bibtex.h (BUF_SIZE, MAX_CITES, MAX_ENT_INTS, MAX_ENT_STRS,
 	MAX_STRS): increase.  From panov, 12 Jul 2007 12:13:38.
-
diff --git a/Build/source/texk/bibtex-x/Makefile.am b/Build/source/texk/bibtex-x/Makefile.am
index 6cbb6068e67..655b5e4cc10 100644
--- a/Build/source/texk/bibtex-x/Makefile.am
+++ b/Build/source/texk/bibtex-x/Makefile.am
@@ -1,6 +1,8 @@
+## $Id$
 ## Makefile.am for the TeX Live subdirectory texk/bibtex-x/
 ##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
+## Copyright 2017  Peter Breitenlohner <tex-live@tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA
@@ -110,4 +112,3 @@ EXTRA_DIST += \
 	csf/COPYING \
 	csf/HISTORY \
 	csf/file_id.diz
-
diff --git a/Build/source/texk/upmendex/Makefile.am b/Build/source/texk/upmendex/Makefile.am
index 47641c00683..b58d6dd3e0f 100644
--- a/Build/source/texk/upmendex/Makefile.am
+++ b/Build/source/texk/upmendex/Makefile.am
@@ -1,6 +1,8 @@
+## $Id$
 ## Makefile.am for the TeX Live subdirectory texk/upmendex/
 ##
-## Copyright (C) 2010-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright 2017 Karl Berry <tex-live@tug.org>
+## Copyright 2010-2014 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(ICU_INCLUDES)
@@ -60,4 +62,3 @@ EXTRA_DIST += $(TESTS)
 EXTRA_DIST += tests/foo.idx tests/foo.ind \
 	tests/uni.idx tests/uni.dict tests/uni.ist tests/uni.ind
 DISTCLEANFILES = foo.* uni.*
-
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index 6b8502b2e3c..26af17248a8 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,7 @@
+2017-04-27  Karl Berry  <karl@tug.org>
+
+	* am/xetex.am (xetex_ldadd): add $(ICU_LIBS_EXTRA).
+
 2017-03-17  Akira Kakuto  <kakuto@fuk.kinidai.ac.jp>
 
 	* Sync with the upstream (version 0.99997).
@@ -662,4 +666,3 @@
 	* XeTeX_ext.c, image/pdfimage.cpp: adapt for poppler.
 
 	patches from Norbert Preinig <preining@logic.at>
-
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index 7fa327c8e82..c806bca053c 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -1,6 +1,8 @@
+## $Id$
 ## texk/web2c/xetexdir/am/xetex.am: Makefile fragment for XeTeX.
 ##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
+## Copyright 2017 Karl Berry <tex-live@tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 ## XeTeX
@@ -210,4 +212,3 @@ endif XETEX
 ## xetex-bug73.test
 EXTRA_DIST += xetexdir/tests/bug73.log xetexdir/tests/bug73.tex
 DISTCLEANFILES += bug73.fmt bug73.log bug73.out bug73.tex
-