fix various build problems: -lsocket, -liconv, foo.exe vs. foo

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

4 files changed, 83 insertions, 53 deletions

diff --git a/Build/source/texk/web2c/am/bootstrap.am b/Build/source/texk/web2c/am/bootstrap.am
index a4dd05ccc80..9e27314160d 100644
--- a/Build/source/texk/web2c/am/bootstrap.am
+++ b/Build/source/texk/web2c/am/bootstrap.am
@@ -1,7 +1,10 @@
 ## texk/web2c/am/bootstrap.am: Makefile fragment for tangle and ctangle.
+##
+## Copyright (C) 2009 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
-## to create an up-to-date tangleboot.p as well.
+# Bootstrapping tangle requires making it with itself.  We use the opportunity
+# to create an up-to-date tangleboot.p as well.
 bin_PROGRAMS += tangle
 nodist_tangle_SOURCES = tangle.c tangle.h
 tangle.c tangle.h: tangle-web2c
@@ -9,11 +12,10 @@ tangle-web2c: tangle.p
 	$(web2c) tangle
 	echo timestamp >$@
 	touch tangle.c tangle.h
-## tangle.p is a special case, since it is needed to compile itself.  We
-## convert and compile the (distributed) tangleboot.p to make a tangle
-## which we use to make the other programs.  We depend on tangleboot, even
-## though we might not use it.
-EXTRA_DIST += tangle.web tangle.ch
+# tangle.p is a special case, since it is needed to compile itself.  We
+# convert and compile the (distributed) tangleboot.p to make a tangle
+# which we use to make the other programs.  We depend on tangleboot, even
+# though we might not use it.
 tangle.p: tangleboot$(EXEEXT) tangle.web tangle.ch
 	WEBINPUTS=.:$(srcdir) $(tangleboot) tangle tangle
 tangle.web:
@@ -26,19 +28,20 @@ tangle.web:
 	@echo "In any case, you can get it from" >&2
 	@echo "ftp://ftp.tug.org/tex/web.tar.gz." >&2
 	false
+EXTRA_DIST += tangle.web tangle.ch
 DISTCLEANFILES += tangle.c tangle.h tangle.p tangle-web2c
 
 noinst_PROGRAMS += tangleboot
 nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h
-tangleboot.c tangleboot.h: stamp-tangle $(web2c_programs) $(web2c_common)
+tangleboot.c tangleboot.h: stamp-tangle $(web2c_depend)
 	$(web2c) tangleboot
-## tangleboot.p is in the distribution
-EXTRA_DIST += tangleboot.p
+# tangleboot.p is in the distribution
 stamp-tangle: tangleboot.p
 	date >stamp-tangle
-## This is not run unless tangle.web or tangle.ch is changed.
-## Only try to run ./tangle if it actually exists, otherwise
-## just touch tangleboot.p and build tangle.
+EXTRA_DIST += tangleboot.p
+# This is not run unless tangle.web or tangle.ch is changed.
+# Only try to run ./tangle if it actually exists, otherwise
+# just touch tangleboot.p and build tangle.
 tangleboot.p: tangle.web tangle.ch
 	if [ -r $(TANGLE) ] || [ -r $(TANGLE).exe ]; then \
 	  $(tangle) tangle tangle; \
@@ -52,31 +55,31 @@ tangleboot.p: tangle.web tangle.ch
 	$(MAKE) $(AM_MAKEFLAGS) tangle$(EXEEXT)
 DISTCLEANFILES += stamp-tangle tangleboot.c tangleboot.h
 
-## Bootstrapping ctangle requires making it with itself.  We use the opportunity
-## to create an up-to-date ctangleboot.c and cwebboot.c as well.
+# Bootstrapping ctangle requires making it with itself.  We use the opportunity
+# to create an up-to-date ctangleboot.c and cwebboot.c as well.
 bin_PROGRAMS += ctangle
 nodist_ctangle_SOURCES = ctangle.c cweb.c
-## ctangle.c is a special case, since it is needed to compile itself.
-## We depend on ctangleboot, even though we might not use it.
-EXTRA_DIST += cwebdir
-## We install man/cweb.man, not cwebdir/cweb.1
-## nodist_man_MANS += cwebdir/cweb.1
+# ctangle.c is a special case, since it is needed to compile itself.
+# We depend on ctangleboot, even though we might not use it.
 ctangle.c: ctangleboot$(EXEEXT) cwebdir/ctangle.w cwebdir/ctang-w2c.ch
 	CWEBINPUTS=$(srcdir)/cwebdir $(ctangleboot) ctangle ctang-w2c
 cweb.c: ctangleboot$(EXEEXT) cwebdir/common.w cwebdir/comm-w2c.ch
 	CWEBINPUTS=$(srcdir)/cwebdir $(ctangleboot) common comm-w2c cweb.c
+EXTRA_DIST += cwebdir
+## We install man/cweb.man, not cwebdir/cweb.1
+## nodist_man_MANS += cwebdir/cweb.1
 DISTCLEANFILES += ctangle.c cweb.c
 
 noinst_PROGRAMS += ctangleboot
 nodist_ctangleboot_SOURCES = ctangleboot.c cwebboot.c
-## ctangleboot.c and cwebboot.c are in the distribution
-EXTRA_DIST += ctangleboot.c cwebboot.c
+# ctangleboot.c and cwebboot.c are in the distribution
 stamp-ctangle: ctangleboot.c cwebboot.c
 	date >stamp-ctangle
-## This is not run unless one of the cwebdir/* files is changed.
-## Only try to run ./ctangle if it actually exists, otherwise
-## just touch ctangleboot.c and/or cwebboot.c and build ctangle.
-## We must serialize this.
+EXTRA_DIST += ctangleboot.c cwebboot.c
+# This is not run unless one of the cwebdir/* files is changed.
+# Only try to run ./ctangle if it actually exists, otherwise
+# just touch ctangleboot.c and/or cwebboot.c and build ctangle.
+# We must serialize this.
 ctangleboot.c: cwebboot.c cwebdir/ctangle.w cwebdir/ctang-w2c.ch
 	if [ -r $(CTANGLE) ] || [ -r $(CTANGLE).exe ]; then \
 	  CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) ctangle ctang-w2c; \
diff --git a/Build/source/texk/web2c/am/cweb.am b/Build/source/texk/web2c/am/cweb.am
index 9cb6692121d..9ae28c722e0 100644
--- a/Build/source/texk/web2c/am/cweb.am
+++ b/Build/source/texk/web2c/am/cweb.am
@@ -1,4 +1,7 @@
 ## texk/web2c/am/cweb.am: Makefile fragment for cweb programs (except ctangle).
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 bin_PROGRAMS += ctie
 nodist_ctie_SOURCES = ctie.c
diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am
index bcecb570e5f..6fb3125c49d 100644
--- a/Build/source/texk/web2c/am/texmf.am
+++ b/Build/source/texk/web2c/am/texmf.am
@@ -1,4 +1,7 @@
 ## texk/web2c/am/texmf.am: Makefile fragment for TeX and MF.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## Common for MF and TeX
 EXTRA_DIST += \
@@ -18,28 +21,35 @@ EXTRA_PROGRAMS += tex
 
 tex_CPPFLAGS =
 
-## With --enable-ipc, TeX may need to link with -lsocket.
+# With --enable-ipc, TeX may need to link with -lsocket.
 tex_LDADD = $(LDADD) $(ipc_socketlibs)
 
+# TeX C sources
 tex_c_h = texini.c tex0.c tex1.c tex2.c texcoerce.h texd.h
 nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c
 $(tex_c_h): tex-web2c
+
 tex-web2c: tex.p $(web2c_texmf)
 	$(web2c) tex
 	: $(synctex_convert_tex)
 	echo timestamp >$@
 	touch $(tex_c_h)
+
+tex-pool.c: tex.pool $(makecpool_stamp) tmf-pool.h
+	$(makecpool) tex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
+
 texextra.c: lib/texmfmp.c texd.h
 	sed s/TEX-OR-MF-OR-MP/tex/ $(srcdir)/lib/texmfmp.c >$@
+
+# Tangling TeX
 tex.p tex.pool: tex-tangle
-tex-tangle: $(TANGLE) tex.web tex-final.ch
+tex-tangle: tangle$(EXEEXT) tex.web tex-final.ch
 	$(tangle) tex.web tex-final.ch
 	echo timestamp >$@
 	touch tex.p tex.pool
-tex-pool.c: tex.pool $(makecpool) tmf-pool.h
-	$(makecpool) tex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
+
 ## Generate tex-final.ch
-tex-final.ch: $(TIE) $(tex_ch_srcs)
+tex-final.ch: tie$(EXEEXT) $(tex_ch_srcs)
 	$(tie) -c $@ $(tex_ch_srcs)
 tex_ch_srcs = \
 	tex.web \
@@ -87,26 +97,37 @@ mf_x_libs = $(X_LIBS) $(x_tool_libs) $(X_PRE_LIBS) $(x_ext_lib) $(wlibs) $(X_EXT
 ## Automake, however, does not support CPPFLAGS for individual source files.
 ## To avoid compiling everything twice, the common objects are in a library.
 EXTRA_LIBRARIES += libmf.a
+
+# Metafont C sources
 mf_c_h = mfini.c mf0.c mf1.c mfcoerce.h mfd.h
 nodist_libmf_a_SOURCES = $(mf_c_h) mf-pool.c
 libmf_a_CPPFLAGS = -DMETA_FONT
+
 $(mf_c_h): mf-web2c
 mf-web2c: mf.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed
 	$(web2c) mf
 	echo timestamp >$@
 	touch $(mf_c_h)
-EXTRA_DIST += mf.web mf-binpool.ch mf.ch mftalk.h lib/texmfmp.c tmf-pool.h
+
+mf-pool.c: mf.pool $(makecpool_stamp) tmf-pool.h
+	$(makecpool) mf.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
+
 mfextra.c: lib/texmfmp.c mfd.h
 	sed s/TEX-OR-MF-OR-MP/mf/ $(srcdir)/lib/texmfmp.c >$@
+
+# Tangling Metafont
 mf.p mf.pool: mf-tangle
-mf-tangle: $(TANGLE) mf.web mf-final.ch
+mf-tangle: tangle$(EXEEXT) mf.web mf-final.ch
 	$(tangle) mf.web mf-final.ch
 	echo timestamp >$@
 	touch mf.p mf.pool
-mf-final.ch: $(TIE) mf.web mf.ch mf-binpool.ch
+
+# Generate mf-final.ch
+mf-final.ch: tie$(EXEEXT) mf.web mf.ch mf-binpool.ch
 	$(tie) -c $@ mf.web mf.ch mf-binpool.ch
-mf-pool.c: mf.pool $(makecpool) tmf-pool.h
-	$(makecpool) mf.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
+##
+EXTRA_DIST += mf.web mf-binpool.ch mf.ch mftalk.h lib/texmfmp.c tmf-pool.h
+
 DISTCLEANFILES += $(nodist_libmf_a_SOURCES) mfextra.c mf-final.ch mf-web2c \
 	mf.p mf.pool mf-tangle
 
diff --git a/Build/source/texk/web2c/am/web.am b/Build/source/texk/web2c/am/web.am
index 6e479078515..2664d04d4fc 100644
--- a/Build/source/texk/web2c/am/web.am
+++ b/Build/source/texk/web2c/am/web.am
@@ -1,4 +1,7 @@
 ## texk/web2c/am/web.am: Makefile fragment for normal web programs (except tangle).
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 web_programs = bibtex dvicopy dvitomp dvitype gftodvi gftopk gftype mft \
 	patgen pktogf pktype pltotf pooltype tftopl vftovp vptovf weave
@@ -14,7 +17,7 @@ DISTCLEANFILES += $(web_programs:=.c) $(web_programs:=.h) \
 
 nodist_bibtex_SOURCES = bibtex.c bibtex.h
 bibtex.c bibtex.h: bibtex-web2c
-bibtex-web2c: $(web2c_common) $(web2c_programs) web2c/cvtbib.sed bibtex.p
+bibtex-web2c: $(web2c_depend) web2c/cvtbib.sed bibtex.p
 	$(web2c) bibtex
 	echo timestamp >$@
 	touch bibtex.c bibtex.h
@@ -23,7 +26,7 @@ bibtex.p: tangle$(EXEEXT) bibtex.web bibtex.ch
 
 nodist_dvicopy_SOURCES = dvicopy.c dvicopy.h
 dvicopy.c dvicopy.h: dvicopy-web2c
-dvicopy-web2c: $(web2c_common) $(web2c_programs) dvicopy.p
+dvicopy-web2c: $(web2c_depend) dvicopy.p
 	$(web2c) dvicopy
 	echo timestamp >$@
 	touch dvicopy.c dvicopy.h
@@ -32,7 +35,7 @@ dvicopy.p: tangle$(EXEEXT) dvicopy.web dvicopy.ch
 
 nodist_dvitomp_SOURCES = dvitomp.c dvitomp.h
 dvitomp.c dvitomp.h: dvitomp-web2c
-dvitomp-web2c: $(web2c_common) $(web2c_programs) dvitomp.p
+dvitomp-web2c: $(web2c_depend) dvitomp.p
 	$(web2c) dvitomp
 	echo timestamp >$@
 	touch dvitomp.c dvitomp.h
@@ -41,7 +44,7 @@ dvitomp.p: tangle$(EXEEXT) dvitomp.web dvitomp.ch
 
 nodist_dvitype_SOURCES = dvitype.c dvitype.h
 dvitype.c dvitype.h: dvitype-web2c
-dvitype-web2c: $(web2c_common) $(web2c_programs) dvitype.p
+dvitype-web2c: $(web2c_depend) dvitype.p
 	$(web2c) dvitype
 	echo timestamp >$@
 	touch dvitype.c dvitype.h
@@ -50,7 +53,7 @@ dvitype.p: tangle$(EXEEXT) dvitype.web dvitype.ch
 
 nodist_gftodvi_SOURCES = gftodvi.c gftodvi.h
 gftodvi.c gftodvi.h: gftodvi-web2c
-gftodvi-web2c: $(web2c_common) $(web2c_programs) gftodvi.p
+gftodvi-web2c: $(web2c_depend) gftodvi.p
 	$(web2c) gftodvi
 	echo timestamp >$@
 	touch gftodvi.c gftodvi.h
@@ -60,7 +63,7 @@ gftodvi_SOURCES = gftodmem.h
 
 nodist_gftopk_SOURCES = gftopk.c gftopk.h
 gftopk.c gftopk.h: gftopk-web2c
-gftopk-web2c: $(web2c_common) $(web2c_programs) gftopk.p
+gftopk-web2c: $(web2c_depend) gftopk.p
 	$(web2c) gftopk
 	echo timestamp >$@
 	touch gftopk.c gftopk.h
@@ -69,7 +72,7 @@ gftopk.p: tangle$(EXEEXT) gftopk.web gftopk.ch
 
 nodist_gftype_SOURCES = gftype.c gftype.h
 gftype.c gftype.h: gftype-web2c
-gftype-web2c: $(web2c_common) $(web2c_programs) gftype.p
+gftype-web2c: $(web2c_depend) gftype.p
 	$(web2c) gftype
 	echo timestamp >$@
 	touch gftype.c gftype.h
@@ -78,7 +81,7 @@ gftype.p: tangle$(EXEEXT) gftype.web gftype.ch
 
 nodist_mft_SOURCES = mft.c mft.h
 mft.c mft.h: mft-web2c
-mft-web2c: $(web2c_common) $(web2c_programs) mft.p
+mft-web2c: $(web2c_depend) mft.p
 	$(web2c) mft
 	echo timestamp >$@
 	touch mft.c mft.h
@@ -87,7 +90,7 @@ mft.p: tangle$(EXEEXT) mft.web mft.ch
 
 nodist_patgen_SOURCES = patgen.c patgen.h
 patgen.c patgen.h: patgen-web2c
-patgen-web2c: $(web2c_common) $(web2c_programs) patgen.p
+patgen-web2c: $(web2c_depend) patgen.p
 	$(web2c) patgen
 	echo timestamp >$@
 	touch patgen.c patgen.h
@@ -96,7 +99,7 @@ patgen.p: tangle$(EXEEXT) patgen.web patgen.ch
 
 nodist_pktogf_SOURCES = pktogf.c pktogf.h
 pktogf.c pktogf.h: pktogf-web2c
-pktogf-web2c: $(web2c_common) $(web2c_programs) pktogf.p
+pktogf-web2c: $(web2c_depend) pktogf.p
 	$(web2c) pktogf
 	echo timestamp >$@
 	touch pktogf.c pktogf.h
@@ -105,7 +108,7 @@ pktogf.p: tangle$(EXEEXT) pktogf.web pktogf.ch
 
 nodist_pktype_SOURCES = pktype.c pktype.h
 pktype.c pktype.h: pktype-web2c
-pktype-web2c: $(web2c_common) $(web2c_programs) pktype.p
+pktype-web2c: $(web2c_depend) pktype.p
 	$(web2c) pktype
 	echo timestamp >$@
 	touch pktype.c pktype.h
@@ -114,7 +117,7 @@ pktype.p: tangle$(EXEEXT) pktype.web pktype.ch
 
 nodist_pltotf_SOURCES = pltotf.c pltotf.h
 pltotf.c pltotf.h: pltotf-web2c
-pltotf-web2c: $(web2c_common) $(web2c_programs) pltotf.p
+pltotf-web2c: $(web2c_depend) pltotf.p
 	$(web2c) pltotf
 	echo timestamp >$@
 	touch pltotf.c pltotf.h
@@ -123,7 +126,7 @@ pltotf.p: tangle$(EXEEXT) pltotf.web pltotf.ch
 
 nodist_pooltype_SOURCES = pooltype.c pooltype.h
 pooltype.c pooltype.h: pooltype-web2c
-pooltype-web2c: $(web2c_common) $(web2c_programs) pooltype.p
+pooltype-web2c: $(web2c_depend) pooltype.p
 	$(web2c) pooltype
 	echo timestamp >$@
 	touch pooltype.c pooltype.h
@@ -132,7 +135,7 @@ pooltype.p: tangle$(EXEEXT) pooltype.web pooltype.ch
 
 nodist_tftopl_SOURCES = tftopl.c tftopl.h
 tftopl.c tftopl.h: tftopl-web2c
-tftopl-web2c: $(web2c_common) $(web2c_programs) tftopl.p
+tftopl-web2c: $(web2c_depend) tftopl.p
 	$(web2c) tftopl
 	echo timestamp >$@
 	touch tftopl.c tftopl.h
@@ -141,7 +144,7 @@ tftopl.p: tangle$(EXEEXT) tftopl.web tftopl.ch
 
 nodist_vftovp_SOURCES = vftovp.c vftovp.h
 vftovp.c vftovp.h: vftovp-web2c
-vftovp-web2c: $(web2c_common) $(web2c_programs) vftovp.p
+vftovp-web2c: $(web2c_depend) vftovp.p
 	$(web2c) vftovp
 	echo timestamp >$@
 	touch vftovp.c vftovp.h
@@ -150,7 +153,7 @@ vftovp.p: tangle$(EXEEXT) vftovp.web vftovp.ch
 
 nodist_vptovf_SOURCES = vptovf.c vptovf.h
 vptovf.c vptovf.h: vptovf-web2c
-vptovf-web2c: $(web2c_common) $(web2c_programs) vptovf.p
+vptovf-web2c: $(web2c_depend) vptovf.p
 	$(web2c) vptovf
 	echo timestamp >$@
 	touch vptovf.c vptovf.h
@@ -159,7 +162,7 @@ vptovf.p: tangle$(EXEEXT) vptovf.web vptovf.ch
 
 nodist_weave_SOURCES = weave.c weave.h
 weave.c weave.h: weave-web2c
-weave-web2c: $(web2c_common) $(web2c_programs) weave.p
+weave-web2c: $(web2c_depend) weave.p
 	$(web2c) weave
 	echo timestamp >$@
 	touch weave.c weave.h