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

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

1 files changed, 104 insertions, 52 deletions

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index f92d0c80216..0cb786f5bdd 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1166,12 +1166,16 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
 	aleph-web2c aleph.p aleph.pool aleph-tangle
 CLEANFILES = 
 web2c = srcdir=$(srcdir) $(SHELL) $(srcdir)/web2c/convert
-makecpool = ./web2c/makecpool
-web2c_common = web2c/convert web2c/common.defines
-web2c_programs = web2c/fixwrites web2c/splitup web2c/web2c $(makecpool)
-web2c_texmf = $(web2c_common) $(web2c_programs) \
-              web2c/texmf.defines web2c/coerce.h
+makecpool = web2c/makecpool
 
+# Additional dependencies:
+web2c_common = web2c/convert web2c/common.defines
+# When cross-compiling, EXEEXT for the build and hosts system may differ.
+# Thus we depend on the auxiliary files web2c/stamp-*.
+web2c_stamps = web2c/stamp-fixwrites web2c/stamp-splitup web2c/stamp-web2c
+makecpool_stamp = web2c/stamp-makecpool
+web2c_depend = $(web2c_common) $(web2c_stamps)
+web2c_texmf = $(web2c_depend) web2c/texmf.defines web2c/coerce.h
 LDADD = $(proglib) $(KPATHSEA_LIBS)
 buildenv = TEXMFCNF=$(srcdir)/../kpathsea
 tangle = WEBINPUTS=.:$(srcdir) $(buildenv) $(TANGLE)
@@ -1210,7 +1214,11 @@ nodist_ctie_SOURCES = ctie.c
 nodist_cweave_SOURCES = cweave.c cweb.c
 nodist_tie_SOURCES = tie.c
 tex_CPPFLAGS = $(am__append_29)
+
+# With --enable-ipc, TeX may need to link with -lsocket.
 tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_30)
+
+# 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 $(am__append_31)
 tex_ch_srcs = \
@@ -1227,6 +1235,8 @@ mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs)
 @MFN_TRUE@mf_nowin_LDADD = libmf.a $(LDADD) $(windowlib)
 windowlib = window/libwindow.a
 mf_x_libs = $(X_LIBS) $(x_tool_libs) $(X_PRE_LIBS) $(x_ext_lib) $(wlibs) $(X_EXTRA_LIBS)
+
+# 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
@@ -1265,7 +1275,11 @@ svgout_c_h = mplibsvg.h mpsvgout.h svgout.c
 libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
 	mplibdir/memio.w mplibdir/tfmin.w
 etex_CPPFLAGS = $(am__append_32)
+
+# With --enable-ipc, e-TeX may need to link with -lsocket.
 etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_33)
+
+# e-TeX C sources
 etex_c_h = etexini.c etex0.c etex1.c etex2.c etexcoerce.h etexd.h
 nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexextra.c \
 	etexdir/etexextra.h $(am__append_34)
@@ -7853,8 +7867,14 @@ dist-hook:
 $(proglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c
 	cd lib && $(MAKE) $(AM_MAKEFLAGS)
 
-$(web2c_programs): $(web2c_common) ${srcdir}/web2c/*.[chly]
-	cd web2c && $(MAKE) $(AM_MAKEFLAGS)
+web2c/stamp-fixwrites: $(web2c_common) ${srcdir}/web2c/*.[chly]
+	cd web2c && $(MAKE) $(AM_MAKEFLAGS) stamp-fixwrites
+web2c/stamp-splitup: $(web2c_common) ${srcdir}/web2c/*.[chly]
+	cd web2c && $(MAKE) $(AM_MAKEFLAGS) stamp-splitup
+web2c/stamp-web2c: $(web2c_common) ${srcdir}/web2c/*.[chly]
+	cd web2c && $(MAKE) $(AM_MAKEFLAGS) stamp-web2c
+web2c/stamp-makecpool: $(web2c_common) ${srcdir}/web2c/makecpool.c
+	cd web2c && $(MAKE) $(AM_MAKEFLAGS) stamp-makecpool
 
 @KPATHSEA_RULE@
 @ZLIB_RULE@
@@ -7872,6 +7892,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.
 tangle.p: tangleboot$(EXEEXT) tangle.web tangle.ch
 	WEBINPUTS=.:$(srcdir) $(tangleboot) tangle tangle
 tangle.web:
@@ -7884,10 +7908,14 @@ tangle.web:
 	@echo "In any case, you can get it from" >&2
 	@echo "ftp://ftp.tug.org/tex/web.tar.gz." >&2
 	false
-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
 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.
 tangleboot.p: tangle.web tangle.ch
 	if [ -r $(TANGLE) ] || [ -r $(TANGLE).exe ]; then \
 	  $(tangle) tangle tangle; \
@@ -7899,12 +7927,19 @@ tangleboot.p: tangle.web tangle.ch
 	fi
 	date >stamp-tangle
 	$(MAKE) $(AM_MAKEFLAGS) tangle$(EXEEXT)
+# 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
+# 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.
 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; \
@@ -7926,119 +7961,119 @@ cwebboot.c: cwebdir/common.w cwebdir/comm-w2c.ch
 	  cp $(srcdir)/cwebboot.c .; \
 	fi
 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
 bibtex.p: tangle$(EXEEXT) bibtex.web bibtex.ch
 	$(tangle) bibtex bibtex
 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
 dvicopy.p: tangle$(EXEEXT) dvicopy.web dvicopy.ch
 	$(tangle) dvicopy dvicopy
 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
 dvitomp.p: tangle$(EXEEXT) dvitomp.web dvitomp.ch
 	$(tangle) dvitomp dvitomp
 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
 dvitype.p: tangle$(EXEEXT) dvitype.web dvitype.ch
 	$(tangle) dvitype dvitype
 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
 gftodvi.p: tangle$(EXEEXT) gftodvi.web gftodvi.ch
 	$(tangle) gftodvi gftodvi
 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
 gftopk.p: tangle$(EXEEXT) gftopk.web gftopk.ch
 	$(tangle) gftopk gftopk
 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
 gftype.p: tangle$(EXEEXT) gftype.web gftype.ch
 	$(tangle) gftype gftype
 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
 mft.p: tangle$(EXEEXT) mft.web mft.ch
 	$(tangle) mft mft
 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
 patgen.p: tangle$(EXEEXT) patgen.web patgen.ch
 	$(tangle) patgen patgen
 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
 pktogf.p: tangle$(EXEEXT) pktogf.web pktogf.ch
 	$(tangle) pktogf pktogf
 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
 pktype.p: tangle$(EXEEXT) pktype.web pktype.ch
 	$(tangle) pktype pktype
 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
 pltotf.p: tangle$(EXEEXT) pltotf.web pltotf.ch
 	$(tangle) pltotf pltotf
 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
 pooltype.p: tangle$(EXEEXT) pooltype.web pooltype.ch
 	$(tangle) pooltype pooltype
 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
 tftopl.p: tangle$(EXEEXT) tftopl.web tftopl.ch
 	$(tangle) tftopl tftopl
 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
 vftovp.p: tangle$(EXEEXT) vftovp.web vftovp.ch
 	$(tangle) vftovp vftovp
 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
 vptovf.p: tangle$(EXEEXT) vptovf.web vptovf.ch
 	$(tangle) vptovf vptovf
 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
@@ -8051,40 +8086,53 @@ cweave.c: ctangle$(EXEEXT) cwebdir/cweave.w cwebdir/cweav-w2c.ch
 tie.c: ctangle$(EXEEXT) tiedir/tie.w tiedir/tie-w2c.ch
 	CWEBINPUTS=$(srcdir)/tiedir $(ctangle) tie.w tie-w2c.ch
 $(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 $@
-tex-final.ch: $(TIE) $(tex_ch_srcs)
+
+tex-final.ch: tie$(EXEEXT) $(tex_ch_srcs)
 	$(tie) -c $@ $(tex_ch_srcs)
 $(windowlib): mfd.h $(srcdir)/window/*.c
 	cd window && $(MAKE) $(AM_MAKEFLAGS) libwindow.a
+
 $(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)
+
+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 $@
 $(oldmpost_c_h): mp-web2c
 mp-web2c: mp.p $(web2c_texmf) mpdir/mp.defines web2c/cvtmf1.sed web2c/cvtmf2.sed
 	$(web2c) mp
@@ -8097,7 +8145,7 @@ mp-tangle: tangle$(EXEEXT) mp.web mp.ch
 	$(tangle) mp mp
 	echo timestamp >$@
 	touch mp.p mp.pool
-mp-pool.c: mp.pool $(makecpool) mpdir/mplib.h
+mp-pool.c: mp.pool $(makecpool_stamp) mpdir/mplib.h
 	$(makecpool) mp.pool $(srcdir)/mpdir/mplib.h >$@ || rm -f $@
 
 $(liboldmpost_a_OBJECTS): mpd.h
@@ -8146,7 +8194,7 @@ etex-web2c: etex.p $(web2c_texmf)
 	echo timestamp >$@
 	touch $(etex_c_h)
 
-etex-pool.c: etex.pool $(makecpool) tmf-pool.h
+etex-pool.c: etex.pool $(makecpool_stamp) tmf-pool.h
 	$(makecpool) etex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
 
 etexextra.c: etexdir/etexextra.h lib/texmfmp.c etexd.h
@@ -8156,21 +8204,25 @@ etexdir/etexextra.h: etexdir/etexextra.in etexdir/etex.version
 	sed s/ETEX-VERSION/`cat etexdir/etex.version`/ \
 	  $(srcdir)/etexdir/etexextra.in >$@
 
+# Tangling e-TeX
 etex.p etex.pool: etex-tangle
 etex-tangle: tangle$(EXEEXT) etex.web etex.ch
 	$(tangle) etex etex
 	echo timestamp >$@
 	touch etex.p etex.pool
 
+# Extract etex version
 etexdir/etex.version: etexdir/etex.ch
 	$(mkdir_p) etexdir
 	grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
 	  | sed "s/^.*'-//;s/'.*$$//" >etexdir/etex.version
 
-etex.web: $(TIE) $(etex_web_srcs)
+# Generate etex.web
+etex.web: tie$(EXEEXT) $(etex_web_srcs)
 	$(tie) -m etex.web $(etex_web_srcs)
 
-etex.ch: $(TIE) etex.web $(etex_ch_srcs)
+# Generate etex.ch
+etex.ch: tie$(EXEEXT) etex.web $(etex_ch_srcs)
 	$(tie) -c etex.ch etex.web $(etex_ch_srcs)
 $(pdftex_c_h): pdftex-web2c
 pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines
@@ -8185,7 +8237,7 @@ pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch
 	$(pdf_tangle) pdftex pdftex
 	echo timestamp >$@
 	touch pdftex.p pdftex.pool
-pdftex-pool.c: pdftex.pool $(makecpool) pdftexdir/ptexlib.h pdftexd.h
+pdftex-pool.c: pdftex.pool $(makecpool_stamp) pdftexdir/ptexlib.h pdftexd.h
 	$(makecpool) pdftex.pool pdftexdir/ptexlib.h >$@ || rm -f $@
 pdftexdir/pdftex.version: pdftexdir/pdftex.web
 	$(mkdir_p) pdftexdir
@@ -8195,7 +8247,7 @@ pdftexdir/pdftexextra.h: pdftexdir/pdftexextra.in pdftexdir/pdftex.version etexd
 	sed -e s/PDFTEX-VERSION/`cat pdftexdir/pdftex.version`/ \
 	    -e s/ETEX-VERSION/`cat etexdir/etex.version`/ \
 	  $(srcdir)/pdftexdir/pdftexextra.in >$@
-pdftex.ch: $(TIE) $(pdftex_ch_srcs)
+pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
 	$(tie) -c pdftex.ch $(pdftex_ch_srcs)
 
 $(libpdftex_a_OBJECTS): pdftexd.h
@@ -8213,7 +8265,7 @@ luatex-tangle: luatangle$(EXEEXT) $(luatex_sources)
 	$(luatex_tangle) --underlines luatex luatex
 	echo timestamp >$@
 	touch luatex.p luatex.pool
-luatex-pool.c: luatex.pool $(makecpool) luatexdir/ptexlib.h luatexd.h
+luatex-pool.c: luatex.pool $(makecpool_stamp) luatexdir/ptexlib.h luatexd.h
 	$(makecpool) luatex.pool luatexdir/ptexlib.h >$@ || rm -f $@
 luatexdir/luatex.version: luatexdir/luatex.web
 	$(mkdir_p) luatexdir
@@ -8223,7 +8275,7 @@ luatexdir/luatexextra.h: luatexdir/luatexextra.in luatexdir/luatex.version
 	sed -e s/LUATEX-VERSION/`cat luatexdir/luatex.version`/ \
 	  $(srcdir)/luatexdir/luatexextra.in >$@
 luatangle.c luatangle.h: luatangle-web2c
-luatangle-web2c: $(web2c_common) $(web2c_programs) luatangle.p
+luatangle-web2c: $(web2c_depend) luatangle.p
 	$(web2c) luatangle
 	echo timestamp >$@
 	touch luatangle.c luatangle.h
@@ -8277,54 +8329,54 @@ xetexdir/xetex.version: xetexdir/xetex.ch
 	grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.ch \
 	  | sed "s/^.*'-//;s/'.*$$//" >$@
 
-xetex.web: $(TIE) $(xetex_web_srcs)
+xetex.web: tie$(EXEEXT) $(xetex_web_srcs)
 	$(tie) -m xetex.web $(xetex_web_srcs)
 
 $(libxetex_a_OBJECTS): xetexd.h
 odvicopy.c odvicopy.h: odvicopy-web2c
-odvicopy-web2c: $(web2c_common) $(web2c_programs) odvicopy.p
+odvicopy-web2c: $(web2c_depend) odvicopy.p
 	$(web2c) odvicopy
 	echo timestamp >$@
 	touch odvicopy.c odvicopy.h
 odvicopy.p: tangle$(EXEEXT) $(odvicopy_sources)
 	$(ow_tangle) odvicopy odvicopy
 odvitype.c odvitype.h: odvitype-web2c
-odvitype-web2c: $(web2c_common) $(web2c_programs) odvitype.p
+odvitype-web2c: $(web2c_depend) odvitype.p
 	$(web2c) odvitype
 	echo timestamp >$@
 	touch odvitype.c odvitype.h
 odvitype.p: tangle$(EXEEXT) $(odvitype_sources)
 	$(ow_tangle) odvitype odvitype
 ofm2opl.c ofm2opl.h: ofm2opl-web2c
-ofm2opl-web2c: $(web2c_common) $(web2c_programs) ofm2opl.p
+ofm2opl-web2c: $(web2c_depend) ofm2opl.p
 	$(web2c) ofm2opl
 	echo timestamp >$@
 	touch ofm2opl.c ofm2opl.h
 ofm2opl.p: tangle$(EXEEXT) $(ofm2opl_sources)
 	$(ow_tangle) ofm2opl ofm2opl
 opl2ofm.c opl2ofm.h: opl2ofm-web2c
-opl2ofm-web2c: $(web2c_common) $(web2c_programs) opl2ofm.p
+opl2ofm-web2c: $(web2c_depend) opl2ofm.p
 	$(web2c) opl2ofm
 	echo timestamp >$@
 	touch opl2ofm.c opl2ofm.h
 opl2ofm.p: tangle$(EXEEXT) $(opl2ofm_sources)
 	$(ow_tangle) opl2ofm opl2ofm
 otangle.c otangle.h: otangle-web2c
-otangle-web2c: $(web2c_common) $(web2c_programs) otangle.p
+otangle-web2c: $(web2c_depend) otangle.p
 	$(web2c) otangle
 	echo timestamp >$@
 	touch otangle.c otangle.h
 otangle.p: tangle$(EXEEXT) $(otangle_sources)
 	$(ow_tangle) otangle otangle
 ovf2ovp.c ovf2ovp.h: ovf2ovp-web2c
-ovf2ovp-web2c: $(web2c_common) $(web2c_programs) ovf2ovp.p
+ovf2ovp-web2c: $(web2c_depend) ovf2ovp.p
 	$(web2c) ovf2ovp
 	echo timestamp >$@
 	touch ovf2ovp.c ovf2ovp.h
 ovf2ovp.p: tangle$(EXEEXT) $(ovf2ovp_sources)
 	$(ow_tangle) ovf2ovp ovf2ovp
 ovp2ovf.c ovp2ovf.h: ovp2ovf-web2c
-ovp2ovf-web2c: $(web2c_common) $(web2c_programs) ovp2ovf.p
+ovp2ovf-web2c: $(web2c_depend) ovp2ovf.p
 	$(web2c) ovp2ovf
 	echo timestamp >$@
 	touch ovp2ovf.c ovp2ovf.h
@@ -8338,7 +8390,7 @@ aleph-web2c: aleph.p $(web2c_texmf) alephdir/aleph.defines
 	$(web2c) aleph
 	echo timestamp >$@
 	touch $(aleph_c_h)
-aleph-pool.c: aleph.pool $(makecpool) alephdir/aleph-pool.h
+aleph-pool.c: aleph.pool $(makecpool_stamp) alephdir/aleph-pool.h
 	$(makecpool) aleph.pool $(srcdir)/alephdir/aleph-pool.h >$@ || rm -f $@
 alephextra.c: lib/texmfmp.c alephdir/alephextra.h alephd.h
 	sed s/TEX-OR-MF-OR-MP/aleph/ $(srcdir)/lib/texmfmp.c >$@
@@ -8348,9 +8400,9 @@ aleph-tangle: otangle$(EXEEXT) aleph.web aleph.ch
 	$(otangle) aleph aleph
 	echo timestamp >$@
 	touch aleph.p aleph.pool
-aleph.web: $(TIE) $(aleph_web_srcs)
+aleph.web: tie$(EXEEXT) $(aleph_web_srcs)
 	$(tie) -m aleph.web $(aleph_web_srcs)
-aleph.ch: $(TIE) aleph.web $(aleph_ch_srcs)
+aleph.ch: tie$(EXEEXT) aleph.web $(aleph_ch_srcs)
 	$(tie) -c aleph.ch aleph.web $(aleph_ch_srcs)
 
 synctex.c: texd.h synctexdir/synctex.c $(dist_tex_SOURCES)