more robust bootstrapping of tangle/ctangle

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

3 files changed, 23 insertions, 11 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 36db8facf8c..57add034f29 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	am/bootstrap.am: Use suffix rules to create tangleboot.p,
+	ctangleboot.c, and cwebboot.[ch] from distributed `in' files.
+
+	* bibtex.ch: Check and correct module numbers.
+	Prepare for |max_strings=hash_size| settable at runtime.
+
 2010-03-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* cpascal.h (kpsesetprogname): Removed.
@@ -22,7 +30,7 @@
 	* bibtex.ch: Use BIB_XRETALLOC_NOSET when resizing several
 	arrays with the same size, to obtain accurate log entries.
 	(add_out_pool): Dynamic output buffer, don't call overflow().
-	(add_area): Remove unused procedure.
+	(file_nm_size_overflow, add_area): Remove unused procedures.
 
 2010-03-08  Karl Berry  <karl@tug.org>
 
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index f0c6e68cdbd..00d36794da7 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -2142,7 +2142,7 @@ all: c-auto.h ff-config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .cc .cpp .cxx .lo .o .obj
+.SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .o .obj .p .pin
 am--refresh:
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luatangle.am $(srcdir)/luatexdir/am/liblua51.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(am__configure_deps)
@@ -7716,8 +7716,8 @@ tangleboot.c tangleboot.h: tangleboot-web2c
 tangleboot-web2c: tangleboot.p $(web2c_depend)
 	@$(web2c) tangleboot
 # tangleboot.pin is in the distribution
-tangleboot.p:
-	cp -f $(srcdir)/$@in $@
+.pin.p:
+	cp -f $< $@
 $(ctangle_OBJECTS): cweb.h
 ctangle.c: ctangle-ctangle
 	@$(ctangleboot) ctangle ctang-w2c
@@ -7729,8 +7729,10 @@ common-ctangle: ctangleboot$(EXEEXT) cwebdir/common.w cwebdir/comm-w2c.ch ctangl
 	@$(ctangleboot) common comm-w2c cweb.c
 $(ctangleboot_OBJECTS): cwebboot.h
 # ctangleboot.cin and cwebboot.[ch]in are in the distribution
-ctangleboot.c cwebboot.c cwebboot.h:
-	cp -f $(srcdir)/$@in $@
+.cin.c:
+	cp -f $< $@
+.hin.h:
+	cp -f $< $@
 bibtex.c bibtex.h: bibtex-web2c
 	@$(web2c) bibtex
 bibtex-web2c: bibtex.p $(web2c_depend) web2c/cvtbib.sed
diff --git a/Build/source/texk/web2c/am/bootstrap.am b/Build/source/texk/web2c/am/bootstrap.am
index 13bf32dfd56..0b9a3036732 100644
--- a/Build/source/texk/web2c/am/bootstrap.am
+++ b/Build/source/texk/web2c/am/bootstrap.am
@@ -1,6 +1,6 @@
 ## texk/web2c/am/bootstrap.am: Makefile fragment for tangle and ctangle.
 ##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 # Bootstrapping tangle requires making it with itself.  We use the opportunity
@@ -38,8 +38,8 @@ tangleboot.c tangleboot.h: tangleboot-web2c
 tangleboot-web2c: tangleboot.p $(web2c_depend)
 	@$(web2c) tangleboot
 # tangleboot.pin is in the distribution
-tangleboot.p:
-	cp -f $(srcdir)/$@in $@
+.pin.p:
+	cp -f $< $@
 tangleboot_DEPENDENCIES = $(default_dependencies)
 EXTRA_DIST += tangleboot.pin
 DISTCLEANFILES += tangleboot.c tangleboot.h tangleboot.p tangleboot-web2c
@@ -70,8 +70,10 @@ noinst_PROGRAMS += ctangleboot
 nodist_ctangleboot_SOURCES = ctangleboot.c cwebboot.c
 $(ctangleboot_OBJECTS): cwebboot.h
 # ctangleboot.cin and cwebboot.[ch]in are in the distribution
-ctangleboot.c cwebboot.c cwebboot.h:
-	cp -f $(srcdir)/$@in $@
+.cin.c:
+	cp -f $< $@
+.hin.h:
+	cp -f $< $@
 ctangleboot_DEPENDENCIES = $(default_dependencies)
 EXTRA_DIST += ctangleboot.cin cwebboot.cin cwebboot.hin
 DISTCLEANFILES += ctangleboot.c cwebboot.c cwebboot.h