new build system: mode texk/xdvik and general update

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

41 files changed, 179 insertions, 123 deletions

diff --git a/Build/source/libs/Makefile.am b/Build/source/libs/Makefile.am
index 1f4bdb8d23a..276e411fa66 100644
--- a/Build/source/libs/Makefile.am
+++ b/Build/source/libs/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory libs/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../m4
 
diff --git a/Build/source/libs/ac/withenable.ac b/Build/source/libs/ac/withenable.ac
index a56321ceb75..36b263962bc 100644
--- a/Build/source/libs/ac/withenable.ac
+++ b/Build/source/libs/ac/withenable.ac
@@ -1 +1,4 @@
-## libs/ac/withenable.ac
+## libs/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
diff --git a/Build/source/libs/dummy/Makefile.am b/Build/source/libs/dummy/Makefile.am
index 257c3fb65a0..3fb6f74a34e 100644
--- a/Build/source/libs/dummy/Makefile.am
+++ b/Build/source/libs/dummy/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory libs/dummy/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 ##
 noinst_DATA = ../sublibsdir-configure
 
diff --git a/Build/source/libs/dummy/README b/Build/source/libs/dummy/README
index fe16d6f99e1..00640c0b4ce 100644
--- a/Build/source/libs/dummy/README
+++ b/Build/source/libs/dummy/README
@@ -1,3 +1,6 @@
+Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+You may freely use, modify and/or distribute this file.
+
 This directory libs/dummy does not build or install anything.  Its purpose
 is to record the command line used to invoke libs/dummy/configure from
 libs/configure.  This information is then used by libs/Makefile to invoke
diff --git a/Build/source/libs/freetype/Makefile.am b/Build/source/libs/freetype/Makefile.am
index 50cb2b7e83f..0dd6397767a 100644
--- a/Build/source/libs/freetype/Makefile.am
+++ b/Build/source/libs/freetype/Makefile.am
@@ -19,9 +19,7 @@ dist-hook:
 	rm -rf `find $(distdir)/$(FREETYPE_TREE) -name .svn`
 
 if build
-
 noinst_DATA = libttf.a
-
 endif build
 
 ft-build/Makefile:
@@ -34,7 +32,7 @@ ft-build/Makefile:
 	    --includedir=$(abs_builddir)
 
 ## Unfortunately the FreeType build system installs the headers after the library;
-## get our dependencies right we wait for a second and then touch the library.
+## to get our dependencies right we wait for a second and then touch the library.
 libttf.a: ft-build/Makefile
 	rm -rf ft-install
 	cd ft-build/lib \
diff --git a/Build/source/libs/freetype/ac/freetype.ac b/Build/source/libs/freetype/ac/freetype.ac
index 90c43ce4ed3..f5d7e28c131 100644
--- a/Build/source/libs/freetype/ac/freetype.ac
+++ b/Build/source/libs/freetype/ac/freetype.ac
@@ -1,3 +1,7 @@
-## libs/freetype/ac/freetype.ac
+## libs/freetype/ac/freetype.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## define required functions and headers from system freetype
 KPSE_CHECK_LIB([freetype], [TT_Init_FreeType], [freetype.h])
diff --git a/Build/source/libs/freetype/ac/withenable.ac b/Build/source/libs/freetype/ac/withenable.ac
index 55cb676e47a..cd0abc14983 100644
--- a/Build/source/libs/freetype/ac/withenable.ac
+++ b/Build/source/libs/freetype/ac/withenable.ac
@@ -1,3 +1,7 @@
-## libs/freetype/ac/withenable.ac
+## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## configure options and TL libraries required for freetype
 KPSE_WITH_LIB([freetype])
diff --git a/Build/source/libs/freetype2/Makefile.am b/Build/source/libs/freetype2/Makefile.am
index 49f9b63ef3a..edfe538a56e 100644
--- a/Build/source/libs/freetype2/Makefile.am
+++ b/Build/source/libs/freetype2/Makefile.am
@@ -19,9 +19,7 @@ dist-hook:
 	rm -rf `find $(distdir)/$(FREETYPE_TREE) -name .svn`
 
 if build
-
 noinst_DATA = libfreetype.a
-
 endif build
 
 ft-build/Makefile:
diff --git a/Build/source/libs/freetype2/ac/freetype2.ac b/Build/source/libs/freetype2/ac/freetype2.ac
index c52d0078f42..1c69124297f 100644
--- a/Build/source/libs/freetype2/ac/freetype2.ac
+++ b/Build/source/libs/freetype2/ac/freetype2.ac
@@ -1,3 +1,7 @@
-## libs/freetype2/ac/freetype2.ac
+## libs/freetype2/ac/freetype2.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## define required functions and headers from system freetype2
 KPSE_CHECK_LIB([freetype2], [FT_Init_FreeType], [ft2build.h])
diff --git a/Build/source/libs/freetype2/ac/withenable.ac b/Build/source/libs/freetype2/ac/withenable.ac
index 97d78f86a29..1ac95763640 100644
--- a/Build/source/libs/freetype2/ac/withenable.ac
+++ b/Build/source/libs/freetype2/ac/withenable.ac
@@ -1,3 +1,7 @@
-## libs/freetype2/ac/withenable.ac
+## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## configure options and TL libraries required for freetype2
 KPSE_WITH_LIB([freetype2], [zlib], , , [both -IDIR and -IDIR/freetype2])
diff --git a/Build/source/libs/gd/Makefile.am b/Build/source/libs/gd/Makefile.am
index c972c77881e..5b043bd13a4 100644
--- a/Build/source/libs/gd/Makefile.am
+++ b/Build/source/libs/gd/Makefile.am
@@ -22,10 +22,9 @@ dist-hook:
 INCLUDES = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES)
 
 if build
-
 noinst_LIBRARIES=libgd.a
-
 endif build
+EXTRA_LIBRARIES=libgd.a
 
 nodist_libgd_a_SOURCES = \
 	$(GD_TREE)/gd.c \
@@ -72,15 +71,15 @@ BUILT_SOURCES = \
 	jisx0208.h \
 	wbmp.h
 
-$(BUILT_SOURCES): stamp-gd
-
-libgd_a_DEPENDENCIES = $(ZLIB_DEPEND) $(LIBPNG_DEPEND)
+$(libgd_a_OBJECTS): $(BUILT_SOURCES) $(ZLIB_DEPEND) $(LIBPNG_DEPEND)
 
 ## Rebuild zlib
 @ZLIB_RULE@
 ## Rebuild libpng
 @LIBPNG_RULE@
 
+$(BUILT_SOURCES): stamp-gd
+
 stamp-gd:
 	@for file in $(BUILT_SOURCES); do \
 	  test -f $$file || { \
@@ -92,7 +91,3 @@ stamp-gd:
 distclean-local:
 	rm -f stamp-gd $(BUILT_SOURCES)
 
-## Eventually delete these files
-##
-EXTRA_DIST += Makefile.in.orig configure.in.orig
-
diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in
index 2d8d22b862e..f9b9ea79940 100644
--- a/Build/source/libs/gd/Makefile.in
+++ b/Build/source/libs/gd/Makefile.in
@@ -190,9 +190,10 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
-EXTRA_DIST = $(GD_TREE) Makefile.in.orig configure.in.orig
+EXTRA_DIST = $(GD_TREE)
 INCLUDES = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES)
 @build_TRUE@noinst_LIBRARIES = libgd.a
+EXTRA_LIBRARIES = libgd.a
 nodist_libgd_a_SOURCES = \
 	$(GD_TREE)/gd.c \
 	$(GD_TREE)/gd_gd.c \
@@ -238,7 +239,6 @@ BUILT_SOURCES = \
 	jisx0208.h \
 	wbmp.h
 
-libgd_a_DEPENDENCIES = $(ZLIB_DEPEND) $(LIBPNG_DEPEND)
 all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -1037,11 +1037,13 @@ uninstall-am:
 dist-hook:
 	rm -rf `find $(distdir)/$(GD_TREE) -name .svn`
 
-$(BUILT_SOURCES): stamp-gd
+$(libgd_a_OBJECTS): $(BUILT_SOURCES) $(ZLIB_DEPEND) $(LIBPNG_DEPEND)
 
 @ZLIB_RULE@
 @LIBPNG_RULE@
 
+$(BUILT_SOURCES): stamp-gd
+
 stamp-gd:
 	@for file in $(BUILT_SOURCES); do \
 	  test -f $$file || { \
diff --git a/Build/source/libs/gd/ac/gd.ac b/Build/source/libs/gd/ac/gd.ac
index 97242870e1b..6b297620e9f 100644
--- a/Build/source/libs/gd/ac/gd.ac
+++ b/Build/source/libs/gd/ac/gd.ac
@@ -1,3 +1,7 @@
-## libs/gd/ac/gd.ac
+## libs/gd/ac/gd.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## define required functions and headers from system gd
 KPSE_CHECK_LIB([gd], [gdImageCreate], [gd.h])
diff --git a/Build/source/libs/gd/ac/withenable.ac b/Build/source/libs/gd/ac/withenable.ac
index 24637010b52..be03732231b 100644
--- a/Build/source/libs/gd/ac/withenable.ac
+++ b/Build/source/libs/gd/ac/withenable.ac
@@ -1,3 +1,7 @@
-## libs/gd/kpse/withenable.ac
+## libs/gd/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## configure options and TL libraries required for gd
 KPSE_WITH_LIB([gd], [libpng])
diff --git a/Build/source/libs/graphite/ac/graphite.ac b/Build/source/libs/graphite/ac/graphite.ac
index 8f6a683247c..da6b30aedda 100644
--- a/Build/source/libs/graphite/ac/graphite.ac
+++ b/Build/source/libs/graphite/ac/graphite.ac
@@ -1,3 +1,7 @@
-## libs/graphite/ac/graphite.ac
+## libs/graphite/ac/graphite.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## define required functions and headers from system graphite
 KPSE_CHECK_LIBXX([graphite], [free], [graphite/GrClient.h])
diff --git a/Build/source/libs/graphite/ac/withenable.ac b/Build/source/libs/graphite/ac/withenable.ac
index a27017bfdb9..d91792f3f81 100644
--- a/Build/source/libs/graphite/ac/withenable.ac
+++ b/Build/source/libs/graphite/ac/withenable.ac
@@ -1,3 +1,12 @@
-## libs/graphite/ac/withenable.ac
+## libs/graphite/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
+## XeTeX can be built without graphite support
+AC_ARG_WITH([graphite],
+            AS_HELP_STRING([--without-graphite],
+                           [build XeTeX without graphite support]))
+test "x$with_graphite" = xno && need_graphite=no
 ## configure options and TL libraries required for graphite
 KPSE_WITH_LIB([graphite])
diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am
index 09b99a10429..e6215891fa6 100644
--- a/Build/source/libs/libpng/Makefile.am
+++ b/Build/source/libs/libpng/Makefile.am
@@ -23,17 +23,9 @@ INCLUDES = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES)
 AM_CPPFLAGS = $(LIBPNG_DEFINES)
 
 if build
-
 noinst_LIBRARIES=libpng.a
-
-TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE)
-
-check_PROGRAMS = pngtest
-dist_check_SCRIPTS = libpng.test
-
 endif build
-
-TESTS = libpng.test
+EXTRA_LIBRARIES=libpng.a
 
 nodist_libpng_a_SOURCES = \
 	$(LIBPNG_TREE)/png.c \
@@ -52,11 +44,18 @@ nodist_libpng_a_SOURCES = \
 	$(LIBPNG_TREE)/pngerror.c \
 	$(LIBPNG_TREE)/pngpread.c
 
-libpng_a_DEPENDENCIES = $(ZLIB_DEPEND)
+$(libpng_a_OBJECTS): $(ZLIB_DEPEND)
 
 ## Rebuild zlib
 @ZLIB_RULE@
 
+if build
+TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE)
+TESTS = libpng.test
+check_PROGRAMS = pngtest
+dist_check_SCRIPTS = libpng.test
+endif build
+
 CLEANFILES = pngout.png
 
 nodist_pngtest_SOURCES = $(LIBPNG_TREE)/pngtest.c
diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in
index 02eb5931b66..ed8d3e441a4 100644
--- a/Build/source/libs/libpng/Makefile.in
+++ b/Build/source/libs/libpng/Makefile.in
@@ -194,9 +194,7 @@ EXTRA_DIST = $(LIBPNG_TREE)
 INCLUDES = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES)
 AM_CPPFLAGS = $(LIBPNG_DEFINES)
 @build_TRUE@noinst_LIBRARIES = libpng.a
-@build_TRUE@TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE)
-@build_TRUE@dist_check_SCRIPTS = libpng.test
-TESTS = libpng.test
+EXTRA_LIBRARIES = libpng.a
 nodist_libpng_a_SOURCES = \
 	$(LIBPNG_TREE)/png.c \
 	$(LIBPNG_TREE)/pngset.c \
@@ -214,7 +212,9 @@ nodist_libpng_a_SOURCES = \
 	$(LIBPNG_TREE)/pngerror.c \
 	$(LIBPNG_TREE)/pngpread.c
 
-libpng_a_DEPENDENCIES = $(ZLIB_DEPEND)
+@build_TRUE@TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE)
+@build_TRUE@TESTS = libpng.test
+@build_TRUE@dist_check_SCRIPTS = libpng.test
 CLEANFILES = pngout.png
 nodist_pngtest_SOURCES = $(LIBPNG_TREE)/pngtest.c
 pngtest_LDADD = libpng.a $(ZLIB_LIBS)
@@ -930,6 +930,8 @@ uninstall-am:
 dist-hook:
 	rm -rf `find $(distdir)/$(LIBPNG_TREE) -name .svn`
 
+$(libpng_a_OBJECTS): $(ZLIB_DEPEND)
+
 @ZLIB_RULE@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/libpng/ac/libpng.ac b/Build/source/libs/libpng/ac/libpng.ac
index 009eb29cd33..fcf51aadf7c 100644
--- a/Build/source/libs/libpng/ac/libpng.ac
+++ b/Build/source/libs/libpng/ac/libpng.ac
@@ -1,3 +1,7 @@
-## libs/libpng/ac/libpng.ac
+## libs/libpng/ac/libpng.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## define required functions and headers from system libpng
 KPSE_CHECK_LIB([libpng], [png_set_read_fn], [png.h])
diff --git a/Build/source/libs/libpng/ac/withenable.ac b/Build/source/libs/libpng/ac/withenable.ac
index 37489800b6c..bd585135b96 100644
--- a/Build/source/libs/libpng/ac/withenable.ac
+++ b/Build/source/libs/libpng/ac/withenable.ac
@@ -1,3 +1,7 @@
-## libs/libpng/kpse/withenable.ac
+## libs/libpng/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## configure options and TL libraries required for libpng
 KPSE_WITH_LIB([libpng], [zlib])
diff --git a/Build/source/libs/obsdcompat/Makefile.am b/Build/source/libs/obsdcompat/Makefile.am
index 42ee5c1fd0a..3c61bb47084 100644
--- a/Build/source/libs/obsdcompat/Makefile.am
+++ b/Build/source/libs/obsdcompat/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory libs/obsdcompat/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
@@ -22,7 +26,3 @@ libopenbsd_compat_a_SOURCES = \
 	includes.h \
 	openbsd-compat.h
 
-## Eventually delete these files
-##
-EXTRA_DIST = libobsd-compat.ac
-
diff --git a/Build/source/libs/obsdcompat/Makefile.in b/Build/source/libs/obsdcompat/Makefile.in
index 9ce9048dee1..b1b66532117 100644
--- a/Build/source/libs/obsdcompat/Makefile.in
+++ b/Build/source/libs/obsdcompat/Makefile.in
@@ -208,7 +208,6 @@ libopenbsd_compat_a_SOURCES = \
 	includes.h \
 	openbsd-compat.h
 
-EXTRA_DIST = libobsd-compat.ac
 all: all-am
 
 .SUFFIXES:
diff --git a/Build/source/libs/obsdcompat/ac/withenable.ac b/Build/source/libs/obsdcompat/ac/withenable.ac
index 6e52d310e91..09d3cb98e2d 100644
--- a/Build/source/libs/obsdcompat/ac/withenable.ac
+++ b/Build/source/libs/obsdcompat/ac/withenable.ac
@@ -1,3 +1,7 @@
-## libs/obsdcompat/ac/withenable.ac
+## libs/obsdcompat/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/obsdcompat/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## configure options and TL libraries required for obsdcompat
 KPSE_WITH_LIB([obsdcompat], , [tree])
diff --git a/Build/source/libs/t1lib/Makefile.am b/Build/source/libs/t1lib/Makefile.am
index 5a644c78636..28f158968c8 100644
--- a/Build/source/libs/t1lib/Makefile.am
+++ b/Build/source/libs/t1lib/Makefile.am
@@ -29,10 +29,9 @@ AM_CFLAGS = $(T1LIB_CFLAGS)
 LDADD = libt1.a
 
 if build
-
 noinst_LIBRARIES = libt1.a
-
 endif build
+EXTRA_LIBRARIES = libt1.a
 
 nodist_libt1_a_SOURCES = $(lib_t1lib_sources) $(lib_type1_sources)
 
@@ -71,12 +70,9 @@ lib_type1_sources = \
 	$(T1LIB_TREE)/lib/type1/util.c
 
 if build
-
 check_PROGRAMS = type1afm
 dist_check_SCRIPTS = type1afm.test
-
 TESTS = type1afm.test
-
 endif build
 
 nodist_type1afm_SOURCES = $(T1LIB_TREE)/type1afm/type1afm.c
diff --git a/Build/source/libs/t1lib/Makefile.in b/Build/source/libs/t1lib/Makefile.in
index c01f53a4b37..569b9351530 100644
--- a/Build/source/libs/t1lib/Makefile.in
+++ b/Build/source/libs/t1lib/Makefile.in
@@ -202,6 +202,7 @@ AM_CPPFLAGS = $(T1LIB_DEFINES) -DT1LIB_IDENT=\"@T1LIB_VERSIONSTRING@\" \
 AM_CFLAGS = $(T1LIB_CFLAGS)
 LDADD = libt1.a
 @build_TRUE@noinst_LIBRARIES = libt1.a
+EXTRA_LIBRARIES = libt1.a
 nodist_libt1_a_SOURCES = $(lib_t1lib_sources) $(lib_type1_sources)
 lib_t1lib_sources = \
 	$(T1LIB_TREE)/lib/t1lib/parseAFM.c \
diff --git a/Build/source/libs/t1lib/ac/t1lib.ac b/Build/source/libs/t1lib/ac/t1lib.ac
index 1e8d0bcdc66..5d7290b909e 100644
--- a/Build/source/libs/t1lib/ac/t1lib.ac
+++ b/Build/source/libs/t1lib/ac/t1lib.ac
@@ -1,4 +1,8 @@
-## libs/t1lib/ac/t1lib.ac
+## libs/t1lib/ac/t1lib.ac: configure.ac fragment for the TeX Live subdirectory libs/t1lib/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## define required functions and headers from system t1lib
 KPSE_CHECK_LIB([t1lib], [T1_AddFont T1_CheckForInit],
                         [t1lib.h])
diff --git a/Build/source/libs/t1lib/ac/withenable.ac b/Build/source/libs/t1lib/ac/withenable.ac
index c67aca06b4c..cb53db398bb 100644
--- a/Build/source/libs/t1lib/ac/withenable.ac
+++ b/Build/source/libs/t1lib/ac/withenable.ac
@@ -1,3 +1,7 @@
-## libs/t1lib/ac/withenable.ac
+## libs/t1lib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/t1lib/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## configure options and TL libraries required for t1lib
 KPSE_WITH_LIB([t1lib])
diff --git a/Build/source/libs/teckit/Makefile.am b/Build/source/libs/teckit/Makefile.am
index d6db6f345e2..84b1ed618e5 100644
--- a/Build/source/libs/teckit/Makefile.am
+++ b/Build/source/libs/teckit/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory libs/teckit/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
@@ -5,9 +9,9 @@ INCLUDES = -I$(top_srcdir)/source/Public-headers $(ZLIB_INCLUDES)
 AM_CPPFLAGS = -DNDEBUG
 
 if build
-EXTRA_LIBRARIES = libTECkit_Compiler.a
 noinst_LIBRARIES = libTECkit.a
 endif
+EXTRA_LIBRARIES = libTECkit_Compiler.a libTECkit.a
 
 libTECkit_Compiler_a_SOURCES = \
 	source/Compiler.cpp \
@@ -80,7 +84,7 @@ EXTRA_DIST += \
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
-## Eventually delete these files
+## Original files
 ##
 EXTRA_DIST += Makefile.am.orig configure.ac.orig
 
diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in
index 9a3b691bda7..d12f9c33853 100644
--- a/Build/source/libs/teckit/Makefile.in
+++ b/Build/source/libs/teckit/Makefile.in
@@ -187,8 +187,8 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
 INCLUDES = -I$(top_srcdir)/source/Public-headers $(ZLIB_INCLUDES)
 AM_CPPFLAGS = -DNDEBUG
-@build_TRUE@EXTRA_LIBRARIES = libTECkit_Compiler.a
 @build_TRUE@noinst_LIBRARIES = libTECkit.a
+EXTRA_LIBRARIES = libTECkit_Compiler.a libTECkit.a
 libTECkit_Compiler_a_SOURCES = \
 	source/Compiler.cpp \
 	source/UnicodeNames.cpp
diff --git a/Build/source/libs/teckit/ac/teckit.ac b/Build/source/libs/teckit/ac/teckit.ac
index 490becdb5a2..cd866e9040d 100644
--- a/Build/source/libs/teckit/ac/teckit.ac
+++ b/Build/source/libs/teckit/ac/teckit.ac
@@ -1,3 +1,7 @@
-## libs/teckit/ac/teckit.ac
+## libs/teckit/ac/teckit.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## define required functions and headers from system teckit
 KPSE_CHECK_LIB([teckit], [TECkit_CreateConverter], [TECkit_Engine.h])
diff --git a/Build/source/libs/teckit/ac/withenable.ac b/Build/source/libs/teckit/ac/withenable.ac
index 536220e52ce..0d910ae81b2 100644
--- a/Build/source/libs/teckit/ac/withenable.ac
+++ b/Build/source/libs/teckit/ac/withenable.ac
@@ -1,3 +1,7 @@
-## libs/teckit/ac/withenable.ac
+## libs/teckit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## configure options and TL libraries required for teckit
 KPSE_WITH_LIB([teckit], [zlib])
diff --git a/Build/source/libs/xpdf/Makefile.am b/Build/source/libs/xpdf/Makefile.am
index 6798ad21e2b..060b39fdbd2 100644
--- a/Build/source/libs/xpdf/Makefile.am
+++ b/Build/source/libs/xpdf/Makefile.am
@@ -98,24 +98,23 @@ xpdf_libxpdf_a_sources = \
 	$(XPDF_SRC)/UnicodeMap.cc \
 	$(XPDF_SRC)/XRef.cc
 
-## ######
 ## Patch for xpdf-3.02pl2
-
+##
 EXTRA_DIST += xpdf-3.02-pl2.patch
 
 ## Patch required to build with -DPDF_PARSER_ONLY
-
+##
 EXTRA_DIST += xpdf-3.02-PDF_PARSER_ONLY.patch
 
 ## Patch required for pdftex
-
+##
 EXTRA_DIST += xpdf-3.02-pdftex.patch
 
 ## Patch required for some systems
-
+##
 EXTRA_DIST += xpdf-3.02-time_h.patch
 
-## Patch required for some mingw32
-
+## Patch required for mingw32
+##
 EXTRA_DIST += xpdf-3.02-mingw32.patch
 
diff --git a/Build/source/libs/xpdf/ac/withenable.ac b/Build/source/libs/xpdf/ac/withenable.ac
index 84f89f7d835..1bb24c7b6d5 100644
--- a/Build/source/libs/xpdf/ac/withenable.ac
+++ b/Build/source/libs/xpdf/ac/withenable.ac
@@ -1,3 +1,7 @@
-## libs/xpdf/ac/withenable.ac
+## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## configure options and TL libraries required for xpdf
 KPSE_WITH_LIB([xpdf], , [tree])
diff --git a/Build/source/libs/xpdf/fofi/Makefile.in b/Build/source/libs/xpdf/fofi/Makefile.in
index 82b4acf1ca2..4ecb6a28056 100644
--- a/Build/source/libs/xpdf/fofi/Makefile.in
+++ b/Build/source/libs/xpdf/fofi/Makefile.in
@@ -298,15 +298,6 @@ uninstall-am:
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am
 
-
-# Makefile.am 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.
-#
 all-local:
 	@for file in $(SRCDIR)/*.h; do \
 	  inst=`echo $$file | sed -e 's/^.*\///'`; \
diff --git a/Build/source/libs/xpdf/goo/Makefile.in b/Build/source/libs/xpdf/goo/Makefile.in
index 2ff8cdb2511..d1be34901a9 100644
--- a/Build/source/libs/xpdf/goo/Makefile.in
+++ b/Build/source/libs/xpdf/goo/Makefile.in
@@ -298,15 +298,6 @@ uninstall-am:
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am
 
-
-# Makefile.am 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.
-#
 all-local:
 	@for file in $(SRCDIR)/*.h; do \
 	  inst=`echo $$file | sed -e 's/^.*\///'`; \
diff --git a/Build/source/libs/xpdf/hdrs.am b/Build/source/libs/xpdf/hdrs.am
index f912939fbc5..80876177a35 100644
--- a/Build/source/libs/xpdf/hdrs.am
+++ b/Build/source/libs/xpdf/hdrs.am
@@ -1,11 +1,11 @@
-# Makefile.am 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.
-#
+## libs/xpdf/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.
+##
 all-local:
 	@for file in $(SRCDIR)/*.h; do \
 	  inst=`echo $$file | sed -e 's/^.*\///'`; \
diff --git a/Build/source/libs/xpdf/xpdf/Makefile.in b/Build/source/libs/xpdf/xpdf/Makefile.in
index b78ab9f4d73..1109e1a2bb6 100644
--- a/Build/source/libs/xpdf/xpdf/Makefile.in
+++ b/Build/source/libs/xpdf/xpdf/Makefile.in
@@ -298,15 +298,6 @@ uninstall-am:
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am
 
-
-# Makefile.am 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.
-#
 all-local:
 	@for file in $(SRCDIR)/*.h; do \
 	  inst=`echo $$file | sed -e 's/^.*\///'`; \
diff --git a/Build/source/libs/zlib/Makefile.am b/Build/source/libs/zlib/Makefile.am
index 5d126bb4135..6f188a23e3d 100644
--- a/Build/source/libs/zlib/Makefile.am
+++ b/Build/source/libs/zlib/Makefile.am
@@ -23,17 +23,9 @@ INCLUDES = -I$(top_srcdir)/$(ZLIB_TREE)
 AM_CPPFLAGS = $(ZLIB_DEFINES)
 
 if build
-
 noinst_LIBRARIES = libz.a
-
-BUILT_SOURCES = zconf.h
-
-check_PROGRAMS = example minigzip
-dist_check_SCRIPTS = zlib.test
-
-TESTS = zlib.test
-
 endif build
+EXTRA_LIBRARIES = libz.a
 
 nodist_libz_a_SOURCES = \
 	$(ZLIB_TREE)/adler32.c \
@@ -57,6 +49,14 @@ nodist_libz_a_SOURCES = \
 	$(ZLIB_TREE)/zutil.h \
 	$(ZLIB_TREE)/zutil.c
 
+$(libz_a_OBJECTS): zconf.h
+
+if build
+check_PROGRAMS = example minigzip
+dist_check_SCRIPTS = zlib.test
+TESTS = zlib.test
+endif build
+
 LDADD = libz.a
 
 nodist_example_SOURCES = $(ZLIB_TREE)/example.c
diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in
index 5c77f8bfaba..9e87426ff21 100644
--- a/Build/source/libs/zlib/Makefile.in
+++ b/Build/source/libs/zlib/Makefile.in
@@ -190,9 +190,7 @@ EXTRA_DIST = $(ZLIB_TREE)
 INCLUDES = -I$(top_srcdir)/$(ZLIB_TREE)
 AM_CPPFLAGS = $(ZLIB_DEFINES)
 @build_TRUE@noinst_LIBRARIES = libz.a
-@build_TRUE@BUILT_SOURCES = zconf.h
-@build_TRUE@dist_check_SCRIPTS = zlib.test
-@build_TRUE@TESTS = zlib.test
+EXTRA_LIBRARIES = libz.a
 nodist_libz_a_SOURCES = \
 	$(ZLIB_TREE)/adler32.c \
 	$(ZLIB_TREE)/compress.c \
@@ -215,12 +213,14 @@ nodist_libz_a_SOURCES = \
 	$(ZLIB_TREE)/zutil.h \
 	$(ZLIB_TREE)/zutil.c
 
+@build_TRUE@dist_check_SCRIPTS = zlib.test
+@build_TRUE@TESTS = zlib.test
 LDADD = libz.a
 nodist_example_SOURCES = $(ZLIB_TREE)/example.c
 nodist_minigzip_SOURCES = $(ZLIB_TREE)/minigzip.c
 DISTCLEANFILES = zconf.h
 CLEANFILES = foo.gz foo_gz
-all: $(BUILT_SOURCES) config.h
+all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
@@ -794,12 +794,10 @@ check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) \
 	  $(dist_check_SCRIPTS)
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
+check: check-am
 all-am: Makefile $(LIBRARIES) config.h
 installdirs:
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-am
+install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -825,7 +823,6 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
 clean-am: clean-checkPROGRAMS clean-generic clean-noinstLIBRARIES \
@@ -909,6 +906,8 @@ uninstall-am:
 dist-hook:
 	rm -rf `find $(distdir)/$(ZLIB_TREE) -name .svn`
 
+$(libz_a_OBJECTS): zconf.h
+
 zconf.h: $(ZLIB_TREE)/zconf.in.h Makefile
 	sed < $< '/HAVE_UNISTD_H/s%^#if [01]%#if $(WITH_UNISTD)%' >$@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/zlib/ac/withenable.ac b/Build/source/libs/zlib/ac/withenable.ac
index 0e61eac2e51..aa0adc23561 100644
--- a/Build/source/libs/zlib/ac/withenable.ac
+++ b/Build/source/libs/zlib/ac/withenable.ac
@@ -1,3 +1,7 @@
-## libs/zlib/ac/withenable.ac
+## libs/zlib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## configure options and TL libraries required for zlib
 KPSE_WITH_LIB([zlib])
diff --git a/Build/source/libs/zlib/ac/zlib.ac b/Build/source/libs/zlib/ac/zlib.ac
index aea063a2250..e5d0efb3f1a 100644
--- a/Build/source/libs/zlib/ac/zlib.ac
+++ b/Build/source/libs/zlib/ac/zlib.ac
@@ -1,3 +1,7 @@
-## libs/zlib/ac/zlib.ac
+## libs/zlib/ac/zlib.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## define required functions and headers from system zlib
 KPSE_CHECK_LIB([zlib], [inflate], [zlib.h])