new build system: mode texk/xdvik and general update

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

4 files changed, 27 insertions, 20 deletions

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])