diff options
author | Karl Berry <karl@freefriends.org> | 2017-03-27 18:00:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-03-27 18:00:45 +0000 |
commit | f6e2e4efbdd44ba2ce51fc1555361c23ec6c8beb (patch) | |
tree | 9997ce03ee8a6032c671c664ff04abc7e89e5729 /Build/source/libs | |
parent | d87f8cf45a06f7b5db4d26d44843a947ab47f55f (diff) |
Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT, per
https://www.gnu.org/software/automake/manual/html_node/Scripts_002dbased-Testsuites.html
Means explicitly exporting all variables, unfortunately.
(EXTRA_DIST): correct Tlpatches typo to TLpatches.
git-svn-id: svn://tug.org/texlive/trunk@43617 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rw-r--r-- | Build/source/libs/libpng/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/libs/libpng/Makefile.am | 10 | ||||
-rw-r--r-- | Build/source/libs/libpng/Makefile.in | 4 | ||||
-rw-r--r-- | Build/source/libs/teckit/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/teckit/Makefile.am | 7 | ||||
-rw-r--r-- | Build/source/libs/teckit/Makefile.in | 2 | ||||
-rw-r--r-- | Build/source/libs/xpdf/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/xpdf/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/libs/xpdf/Makefile.in | 2 | ||||
-rw-r--r-- | Build/source/libs/zziplib/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/libs/zziplib/Makefile.am | 9 | ||||
-rw-r--r-- | Build/source/libs/zziplib/Makefile.in | 4 |
12 files changed, 33 insertions, 27 deletions
diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog index 3d760abea67..66c275438c0 100644 --- a/Build/source/libs/libpng/ChangeLog +++ b/Build/source/libs/libpng/ChangeLog @@ -1,3 +1,8 @@ +2017-03-27 Karl Berry <karl@freefriends.org> + + * Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT. + (EXTRA_DIST): TLpatches not Tlpatches. + 2017-03-16 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Import libpng-1.6.29. diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am index e76d1f5fbe7..249af956119 100644 --- a/Build/source/libs/libpng/Makefile.am +++ b/Build/source/libs/libpng/Makefile.am @@ -7,14 +7,12 @@ ## 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. -## + ## We want to re-distribute the whole libpng source tree. -## EXTRA_DIST = $(LIBPNG_TREE) ## Changes applied to the original source tree -## -EXTRA_DIST += Tlpatches +EXTRA_DIST += TLpatches # Files not to be distributed include $(srcdir)/../../am/dist_hook.am @@ -48,8 +46,7 @@ nodist_libpng_a_SOURCES = \ $(libpng_a_OBJECTS): config.force ## Tests -## -TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE) +AM_TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE); export LIBPNG_TREE; if build TESTS = libpng.test check_PROGRAMS = pngtest @@ -76,4 +73,3 @@ rebuild_prereq = rebuild_target = all include $(srcdir)/../../am/rebuild.am - diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in index cfc78b27786..82871d33dde 100644 --- a/Build/source/libs/libpng/Makefile.in +++ b/Build/source/libs/libpng/Makefile.in @@ -562,7 +562,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = $(LIBPNG_TREE) Tlpatches +EXTRA_DIST = $(LIBPNG_TREE) TLpatches NEVER_DIST = `find . $(NEVER_NAMES)` # Files not to be distributed @@ -592,7 +592,7 @@ nodist_libpng_a_SOURCES = \ @LIBPNG_TREE@/pngerror.c \ @LIBPNG_TREE@/pngpread.c -TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE) +AM_TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE); export LIBPNG_TREE; @build_TRUE@TESTS = libpng.test @build_TRUE@dist_check_SCRIPTS = libpng.test CLEANFILES = pngout.png rebuild.stamp diff --git a/Build/source/libs/teckit/ChangeLog b/Build/source/libs/teckit/ChangeLog index 0e7196ce60a..74048038adb 100644 --- a/Build/source/libs/teckit/ChangeLog +++ b/Build/source/libs/teckit/ChangeLog @@ -1,3 +1,7 @@ +2017-03-27 Karl Berry <karl@freefriends.org> + + * Makefile.am (EXTRA_DIST): TLpatches not Tlpatches. + 2016-12-30 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Import TECkit-2.5.6. diff --git a/Build/source/libs/teckit/Makefile.am b/Build/source/libs/teckit/Makefile.am index 1da454696c0..9709f851b34 100644 --- a/Build/source/libs/teckit/Makefile.am +++ b/Build/source/libs/teckit/Makefile.am @@ -4,14 +4,12 @@ ## 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. -## + ## We want to re-distribute the whole original TECkit source tree. -## EXTRA_DIST = $(TECKIT_TREE) ## Patches applied to the original source tree -## -EXTRA_DIST += Tlpatches +EXTRA_DIST += TLpatches # Files not to be distributed include $(srcdir)/../../am/dist_hook.am @@ -79,4 +77,3 @@ rebuild_prereq = rebuild_target = all include $(srcdir)/../../am/rebuild.am - diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in index 8766c311c0c..9c777a6fbdc 100644 --- a/Build/source/libs/teckit/Makefile.in +++ b/Build/source/libs/teckit/Makefile.in @@ -576,7 +576,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = $(TECKIT_TREE) Tlpatches teckit.test tex-text.map \ +EXTRA_DIST = $(TECKIT_TREE) TLpatches teckit.test tex-text.map \ tex-text.tec NEVER_DIST = `find . $(NEVER_NAMES)` diff --git a/Build/source/libs/xpdf/ChangeLog b/Build/source/libs/xpdf/ChangeLog index f46aca5fab4..d8345036d99 100644 --- a/Build/source/libs/xpdf/ChangeLog +++ b/Build/source/libs/xpdf/ChangeLog @@ -1,3 +1,7 @@ +2017-03-27 Karl Berry <karl@freefriends.org> + + * Makefile.am (EXTRA_DIST): TLpatches not Tlpatches. + 2016-02-15 Karl Berry <karl@tug.org> * xpdf-PATCHES: rename from xpdf-3.04-PATCHES. diff --git a/Build/source/libs/xpdf/Makefile.am b/Build/source/libs/xpdf/Makefile.am index ea4b2e22f3f..f5005923108 100644 --- a/Build/source/libs/xpdf/Makefile.am +++ b/Build/source/libs/xpdf/Makefile.am @@ -31,8 +31,7 @@ EXTRA_DIST = $(XPDF_TREE) EXTRA_DIST += xpdf-foolabs ## Actual patches applied to the original source tree -## -EXTRA_DIST += Tlpatches +EXTRA_DIST += TLpatches # Files not to be distributed include $(srcdir)/../../am/dist_hook.am @@ -123,4 +122,3 @@ rebuild_target = all CLEANFILES = include $(srcdir)/../../am/rebuild.am - diff --git a/Build/source/libs/xpdf/Makefile.in b/Build/source/libs/xpdf/Makefile.in index 21f0a33bb07..6d6082dbb40 100644 --- a/Build/source/libs/xpdf/Makefile.in +++ b/Build/source/libs/xpdf/Makefile.in @@ -395,7 +395,7 @@ top_srcdir = @top_srcdir@ #======================================================================== #======================================================================== ACLOCAL_AMFLAGS = -I ../../m4 -EXTRA_DIST = $(XPDF_TREE) xpdf-foolabs Tlpatches +EXTRA_DIST = $(XPDF_TREE) xpdf-foolabs TLpatches NEVER_DIST = `find . $(NEVER_NAMES)` # Files not to be distributed diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog index 3a8e1c32635..1f9f138c48a 100644 --- a/Build/source/libs/zziplib/ChangeLog +++ b/Build/source/libs/zziplib/ChangeLog @@ -1,3 +1,8 @@ +2017-03-27 Karl Berry <karl@freefriends.org> + + * Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT. + (EXTRA_DIST): TLpatches not Tlpatches. + 2016-02-22 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * Makefile.am, configure.ac: New convention. diff --git a/Build/source/libs/zziplib/Makefile.am b/Build/source/libs/zziplib/Makefile.am index 45f663d55db..e655816c109 100644 --- a/Build/source/libs/zziplib/Makefile.am +++ b/Build/source/libs/zziplib/Makefile.am @@ -7,14 +7,12 @@ ## 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. -## + ## We want to re-distribute the whole zziplib source tree. -## EXTRA_DIST = $(ZZIPLIB_TREE) ## Changes applied to the original source tree -## -EXTRA_DIST += Tlpatches +EXTRA_DIST += TLpatches # Files not to be distributed include $(srcdir)/../../am/dist_hook.am @@ -43,7 +41,7 @@ $(libzzip_a_OBJECTS): config.force DISTCLEANFILES = include/_msvc.in _configs.sed -TESTS_ENVIRONMENT = ZZIPLIB_TREE=$(ZZIPLIB_TREE) +AM_TESTS_ENVIRONMENT = ZZIPLIB_TREE=$(ZZIPLIB_TREE); export ZZIPLIB_TREE; if build TESTS = zziplib.test check_PROGRAMS = unzzip @@ -71,4 +69,3 @@ rebuild_target = all CLEANFILES = include $(srcdir)/../../am/rebuild.am - diff --git a/Build/source/libs/zziplib/Makefile.in b/Build/source/libs/zziplib/Makefile.in index b7f6a71f253..503a305fb77 100644 --- a/Build/source/libs/zziplib/Makefile.in +++ b/Build/source/libs/zziplib/Makefile.in @@ -572,7 +572,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = $(ZZIPLIB_TREE) Tlpatches +EXTRA_DIST = $(ZZIPLIB_TREE) TLpatches NEVER_DIST = `find . $(NEVER_NAMES)` # Files not to be distributed @@ -596,7 +596,7 @@ nodist_libzzip_a_SOURCES = \ @ZZIPLIB_TREE@/zzip/zip.c DISTCLEANFILES = include/_msvc.in _configs.sed config.force -TESTS_ENVIRONMENT = ZZIPLIB_TREE=$(ZZIPLIB_TREE) +AM_TESTS_ENVIRONMENT = ZZIPLIB_TREE=$(ZZIPLIB_TREE); export ZZIPLIB_TREE; @build_TRUE@TESTS = zziplib.test @build_TRUE@dist_check_SCRIPTS = zziplib.test nodist_unzzip_SOURCES = @ZZIPLIB_TREE@/bins/unzzip.c |