remove obsolete files

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

11 files changed, 13 insertions, 1000 deletions

diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog
index 5e6875f9485..5eaffcb29cd 100644
--- a/Build/source/texk/web2c/alephdir/ChangeLog
+++ b/Build/source/texk/web2c/alephdir/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* aleph.mk (removed): Obsolete.
+
 2011-01-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* alephextra.c (new): #include <alephd.h> and <lib/texmfmp.c>.
diff --git a/Build/source/texk/web2c/alephdir/aleph.mk b/Build/source/texk/web2c/alephdir/aleph.mk
deleted file mode 100644
index 71e5e875681..00000000000
--- a/Build/source/texk/web2c/alephdir/aleph.mk
+++ /dev/null
@@ -1,165 +0,0 @@
-# Makefile fragment for Aleph and web2c. --infovore@xs4all.nl. Public domain.
-# This fragment contains the parts of the makefile that are most likely to
-# differ between releases of Aleph.
-
-alephdir = alephdir
-calephdir = alephdir
-
-Makefile: $(alephdir)/aleph.mk
-# 
-# Aleph itself.
-
-# We build aleph
-aleph = @ALEPH@ aleph
-alephbuild=rc2
-
-# The C sources.
-aleph_c = alephini.c aleph0.c aleph1.c aleph2.c aleph3.c
-aleph_o = alephini.o aleph0.o aleph1.o aleph2.o \
-	      alephextra.o aleph.o alephbis.o \
-              aleph3.o aleph-pool.o
-
-# Linking
-aleph: $(aleph_o)
-	$(kpathsea_link) $(aleph_o) $(socketlibs) $(LOADLIBES)
-
-# The C files
-$(aleph_c) alephcoerce.h alephd.h: aleph.p $(web2c_texmf)
-	$(web2c) aleph
-alephextra.c: lib/texmfmp.c
-	sed s/TEX-OR-MF-OR-MP/aleph/ $(srcdir)/lib/texmfmp.c >$@
-$(alephdir)/alephextra.h: $(alephdir)/alephextra-$(alephbuild).h
-	-rm -f $@
-	test -d $(alephdir) || mkdir $(alephdir)
-	cp $(srcdir)/$(alephdir)/alephextra-$(alephbuild).h $@
-
-# Additional C files, just copy them.
-aleph.c: $(calephdir)/aleph.c
-	-rm -f $@
-	cp $(srcdir)/$(calephdir)/aleph.c $@
-alephbis.c: $(calephdir)/alephbis.c 
-	-rm -f $@
-	cp $(srcdir)/$(calephdir)/alephbis.c $@
-alephmem.h: $(calephdir)/alephmem.h
-	-rm -f $@
-	cp $(srcdir)/$(calephdir)/alephmem.h $@
-
-# The Pascal file
-aleph.p aleph.pool: otangle aleph.web aleph.ch
-	$(OTANGLE) aleph.web aleph.ch
-
-# Generation of the web and ch files.
-aleph.web: tie tex.web $(alephdir)/aleph.mk
-aleph.web: $(alephdir)/om16bit.ch
-aleph.web: $(alephdir)/omstr.ch
-aleph.web: $(alephdir)/omfont.ch
-aleph.web: $(alephdir)/omchar.ch
-aleph.web: $(alephdir)/omfi.ch
-aleph.web: $(alephdir)/ompar.ch
-aleph.web: $(alephdir)/omocp.ch
-aleph.web: $(alephdir)/omfilter.ch
-aleph.web: $(alephdir)/omtrans.ch
-aleph.web: $(alephdir)/omdir.ch
-aleph.web: $(alephdir)/eobase.ch
-aleph.web: $(alephdir)/eofmt.ch
-aleph.web: $(alephdir)/eomem-$(alephbuild).ch
-aleph.web: $(alephdir)/eo16bit-$(alephbuild).ch
-aleph.web: $(alephdir)/eoext.ch
-aleph.web: $(alephdir)/eoeqtb.ch
-aleph.web: $(alephdir)/eofix.ch
-aleph.web: $(alephdir)/eocprt.ch
-aleph.web: $(alephdir)/eonewdir-$(alephbuild).ch
-aleph.web: $(alephdir)/eover-$(alephbuild).ch
-aleph.web: $(alephdir)/eopage-$(alephbuild).ch
-aleph.web: $(alephdir)/eochar-$(alephbuild).ch
-	$(TIE) -m aleph.web $(srcdir)/tex.web \
-	 $(srcdir)/$(alephdir)/om16bit.ch \
-	 $(srcdir)/$(alephdir)/omstr.ch \
-	 $(srcdir)/$(alephdir)/omfont.ch \
-	 $(srcdir)/$(alephdir)/omchar.ch \
-	 $(srcdir)/$(alephdir)/omfi.ch \
-	 $(srcdir)/$(alephdir)/ompar.ch \
-	 $(srcdir)/$(alephdir)/omocp.ch \
-	 $(srcdir)/$(alephdir)/omfilter.ch \
-	 $(srcdir)/$(alephdir)/omtrans.ch \
-	 $(srcdir)/$(alephdir)/omdir.ch \
-	 $(srcdir)/$(alephdir)/eobase.ch \
-	 $(srcdir)/$(alephdir)/eofmt.ch \
-	 $(srcdir)/$(alephdir)/eomem-$(alephbuild).ch \
-	 $(srcdir)/$(alephdir)/eo16bit-$(alephbuild).ch \
-	 $(srcdir)/$(alephdir)/eoext.ch \
-	 $(srcdir)/$(alephdir)/eoeqtb.ch \
-	 $(srcdir)/$(alephdir)/eofix.ch \
-	 $(srcdir)/$(alephdir)/eocprt.ch \
-	 $(srcdir)/$(alephdir)/eonewdir-$(alephbuild).ch \
-	 $(srcdir)/$(alephdir)/eover-$(alephbuild).ch \
-	 $(srcdir)/$(alephdir)/eopage-$(alephbuild).ch \
-	 $(srcdir)/$(alephdir)/eochar-$(alephbuild).ch
-aleph.ch: tie aleph.web $(alephdir)/aleph.mk
-aleph.ch: $(calephdir)/com16bit-$(alephbuild).ch
-aleph.ch: $(calephdir)/comstr.ch
-aleph.ch: $(calephdir)/comfont.ch
-aleph.ch: $(calephdir)/comchar.ch
-aleph.ch: $(calephdir)/comfi.ch
-aleph.ch: $(calephdir)/compar.ch
-aleph.ch: $(calephdir)/comocp.ch
-aleph.ch: $(calephdir)/comfilter.ch
-aleph.ch: $(calephdir)/comtrans.ch
-aleph.ch: $(calephdir)/comdir.ch
-aleph.ch: $(calephdir)/comsrcspec.ch
-aleph.ch: $(calephdir)/ceostuff.ch
-	$(TIE) -c aleph.ch aleph.web \
-	 $(srcdir)/$(calephdir)/com16bit-$(alephbuild).ch \
-	 $(srcdir)/$(calephdir)/comstr.ch \
-	 $(srcdir)/$(calephdir)/comfont.ch \
-	 $(srcdir)/$(calephdir)/comchar.ch \
-	 $(srcdir)/$(calephdir)/comfi.ch \
-	 $(srcdir)/$(calephdir)/compar.ch \
-	 $(srcdir)/$(calephdir)/comocp.ch \
-	 $(srcdir)/$(calephdir)/comfilter.ch \
-	 $(srcdir)/$(calephdir)/comtrans.ch \
-	 $(srcdir)/$(calephdir)/comdir.ch \
-	 $(srcdir)/$(calephdir)/comsrcspec.ch \
-	 $(srcdir)/$(calephdir)/ceostuff.ch
-
-aleph-pool.c: aleph.pool $(makecpool)
-	$(makecpool) aleph.pool alephdir/aleph-pool.h >$@ || rm -f $@
-
-# Check: right now all we do is build the format.
-check: @ALEPH@ aleph-check
-aleph-check: aleph aleph.fmt
-# Cleaning up from building aleph
-clean:: aleph-clean
-aleph-clean:
-	$(LIBTOOL) --mode=clean $(RM) aleph
-	rm -f $(aleph_c) alephextra.c alephcoerce.h alephd.h
-	rm -f $(alephdir)/alephextra.h
-	rm -f aleph.c alephbis.c alephmem.h
-	rm -f aleph.p aleph.pool aleph.web aleph.ch
-
-# 
-# Dumps.
-all_afmts = aleph.fmt $(afmts)
-
-dumps: @ALEPH@ afmts
-afmts: $(all_afmts)
-
-afmtdir = $(web2cdir)/aleph
-$(afmtdir)::
-	$(SHELL) $(top_srcdir)/../mkinstalldirs $(afmtdir)
-
-aleph.fmt: aleph
-	$(dumpenv) $(MAKE) progname=aleph files="omega.ini" prereq-check
-	$(dumpenv) ./aleph --ini --progname=aleph --jobname=aleph \\input omega.tex \\dump </dev/null
-lamed.fmt: aleph
-	$(dumpenv) $(MAKE) progname=lamed files="lambda.tex" prereq-check
-	$(dumpenv) ./aleph --ini --progname=lamed --jobname=lamed \\input lambda.tex </dev/null
-
-# 
-# Installation.
-install-aleph: install-aleph-exec
-install-programs: @ALEPH@ install-aleph-exec
-install-aleph-exec: aleph $(bindir)
-	for p in aleph; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-
-# end of aleph.mk
diff --git a/Build/source/texk/web2c/alephdir/am/aleph.am b/Build/source/texk/web2c/alephdir/am/aleph.am
index 4bb996a2592..bf55d8ee007 100644
--- a/Build/source/texk/web2c/alephdir/am/aleph.am
+++ b/Build/source/texk/web2c/alephdir/am/aleph.am
@@ -107,5 +107,5 @@ EXTRA_DIST += \
 
 ## Eventually delete these files
 ##
-EXTRA_DIST += alephdir/aleph-pool.h alephdir/aleph.mk
+EXTRA_DIST += alephdir/aleph-pool.h
 
diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog
index f1b9d53192b..3b822c733ad 100644
--- a/Build/source/texk/web2c/etexdir/ChangeLog
+++ b/Build/source/texk/web2c/etexdir/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* etex.mak, etex.mk (removed): Obsolete.
+
 2011-01-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/etex.am (etex_web_srcs): Removed etex.fix.
diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am
index 76a5b230c47..90793c47ba1 100644
--- a/Build/source/texk/web2c/etexdir/am/etex.am
+++ b/Build/source/texk/web2c/etexdir/am/etex.am
@@ -119,11 +119,3 @@ EXTRA_DIST += \
 	etexdir/etrip/texmf.cnf \
 	etexdir/etrip/trip2.in
 
-## Not used
-##
-EXTRA_DIST += etexdir/etex.mak
-
-## Eventually delete these files
-##
-EXTRA_DIST += etexdir/etex.mk
-
diff --git a/Build/source/texk/web2c/etexdir/etex.mak b/Build/source/texk/web2c/etexdir/etex.mak
deleted file mode 100644
index 4f3cea32f41..00000000000
--- a/Build/source/texk/web2c/etexdir/etex.mak
+++ /dev/null
@@ -1,242 +0,0 @@
-################################################################################
-#
-# Makefile  : eTeX, web2c win32.mak makefile fragment to build e-TeX
-# Author    : Fabrice Popineau <Fabrice.Popineau@supelec.fr>
-# Platform  : Win32, Microsoft VC++ 6.0, depends upon fpTeX 0.5 sources
-# Time-stamp: <04/03/20 16:41:06 popineau>
-#
-################################################################################
-
-etexver = 
-
-# We build etex.
-etex = $(objdir)\etex.exe
-!ifdef TEX_DLL
-etex = $(etex) $(objdir)\$(library_prefix)etex.dll
-!endif
-
-# The C sources.
-etex_c = etex.c
-etex_o = $(objdir)\etex.obj
-
-!ifdef TEX_DLL
-$(objdir)\$(library_prefix)etex.exp: $(objdir)\$(library_prefix)etex.lib
-
-$(objdir)\$(library_prefix)etex.lib: $(etex_o)
-	$(archive) /DEF $(etex_o)
-
-$(objdir)\$(library_prefix)etex.dll: $(etex_o) $(objdir)\$(library_prefix)etex.exp $(objdir)\etex.res $(kpathsealib) $(proglib)
-	$(link_dll) $(**) $(socketlibs) $(conlibs)
-
-$(objdir)\etex.exe: $(objdir)\win32main.obj $(objdir)\$(library_prefix)etex.lib $(proglib)
-	$(link) $(**) $(conlibs)
-!else
-$(objdir)\etex.exe: $(etex_o) $(objdir)\win32main.obj $(objdir)\etex.res $(kpathsealib) $(proglib)
-	$(link) $(**) $(conlibs)
-!endif
-
-# C file dependencies
-$(etex_c) etexcoerce.h etexd.h: etex.p $(web2c_texmf)
-	$(web2c) etex
-
-# Tangling
-etex.p etex.pool: etex.web etex.ch
-	.\$(objdir)\tangle etex.web etex.ch
-
-# Generation of the web and ch file.
-etex.web: $(objdir)\tie.exe tex.web etexdir/etex.ch0 etexdir/etex.ch etexdir/etex.fix etexdir/etex.ch1
-	.\$(objdir)\tie -m etex.web		\
-		           tex.web	\
-			   etexdir/etex.ch0 \
-			   etexdir/etex.ch \
-			   etexdir/etex.fix \
-		           etexdir/etex.ch1
-
-etex.ch: $(objdir)\tie.exe etex.web etexdir/tex.ch0 tex.ch tex-supp-w32.ch etexdir/tex.ch1 etexdir/tex.ech etexdir/tex.ch2
-	.\$(objdir)\tie -c etex.ch etex.web			\
-			   etexdir/tex.ch0 	\
-			   tex.ch	 		\
-			   tex-supp-w32.ch	 		\
-			   etexdir/tex.ch1 	\
-			   etexdir/tex.ech	\
-			   etexdir/tex.ch2
-
-# Tests...
-check: etex-check
-etex-check: etrip etex.efmt
-# Test truncation (but don't bother showing the warning msg).
-	.\$(objdir)\etex --progname=etex --output-comment="$(outcom)" \
-	  $(srcdir)/tests/hello \
-	  && .\$(objdir)\dvitype hello.dvi | grep olaf@infovore.xs4all.nl >nul
-# \openout should show up in \write's.
-	.\$(objdir)\etex --progname=etex $(srcdir)/tests/openout && grep xfoo openout.log
-# one.two.tex -> one.two.log
-	.\$(objdir)\etex --progname=etex $(srcdir)/tests/one.two && dir /w one.two.log
-# uno.dos -> uno.log
-	.\$(objdir)\etex --progname=etex $(srcdir)/tests/uno.dos && dir /w uno.log
-	.\$(objdir)\etex --progname=etex $(srcdir)/tests/just.texi && dir /w just.log
-	-.\$(objdir)\etex --progname=etex $(srcdir)/tests/batch.tex
-	.\$(objdir)\etex --progname=etex --shell $(srcdir)/tests/write18 | grep echo
-# tcx files are a bad idea.
-#	.\$(objdir)\etex --translate-file=$(srcdir)/share/isol1-t1.tcx \
-#	  $(srcdir)/tests/eight && ./dvitype eight.dvi >eigh.typ
-	.\$(objdir)\etex --mltex --progname=einitex $(srcdir)/tests/mltextst
-	-.\$(objdir)\etex --progname=etex <nul
-#	-PATH=$(kpathsea_dir):$$PATH .\$(objdir)\etex '\nonstopmode\font\foo=nonesuch\end'
-	set PATH=$(kpathsea_dir);$(kpathsea_srcdir);$(PATH)
-	set WEB2C=$(kpathsea_srcdir)
-	set TMPDIR=..
-	-.\$(objdir)\etex --progname=etex "\nonstopmode\font\foo=nonesuch\end"
-
-
-# Cleaning up.
-clean:: etex-clean
-etex-clean: etrip-clean
-#	$(LIBTOOL) --mode=clean $(RM) etex
-	-@echo $(verbose) & ( \
-		for %%i in ($(etex_o) $(etex_c) etexextra.c etexcoerce.h etexd.h \
-			    etex.p etex.pool etex.web etex.ch \
-			    etex.efmt etex.log \
-			    hello.dvi hello.log xfoo.out openout.log one.two.log uno.log \
-			    just.log batch.log write18.log mltextst.log texput.log \
-			    missfont.log) do $(del) %%i $(redir_stderr) \
-	)
-	-@$(deldir) tfm $(redir_stderr)
-
-#etrip
-etestdir = $(srcdir)\etexdir\etrip
-
-etrip: $(objdir)\pltotf.exe $(objdir)\tftopl.exe $(objdir)\etex.exe $(objdir)\dvitype.exe etrip-clean
-	@echo ">>> See $(etestdir)\etrip.diffs for example of acceptable diffs."
-	@echo "*** TRIP test for e-TeX in compatibility mode ***."
-	.\$(objdir)\pltotf $(testdir)\trip.pl trip.tfm
-	.\$(objdir)\tftopl .\trip.tfm trip.pl
-	-$(diff) $(testdir)\trip.pl trip.pl
-	-$(del) \f trip.tex & $(copy) $(testdir)\trip.tex . # get same filename in log
-# FIXME: this works only written on 2 lines !!!
-	set TEXMFCNFOLD=$(TEXMFCNF)
-	set TEXMFCNF=$(etestdir)
-	-.\$(objdir)\etex --progname=einitex <$(testdir)\trip1.in >ctripin.fot
-	$(copy) trip.log ctripin.log & $(del) trip.log
-	-$(diff) $(testdir)\tripin.log ctripin.log
-	-.\$(objdir)\etex <$(testdir)\trip2.in >ctrip.fot
-	$(copy) trip.log ctrip.log & $(del) trip.log
-	-$(diff) $(testdir)\trip.fot ctrip.fot
-	-$(diff) $(diffflags) $(testdir)\trip.log ctrip.log
-	.\$(objdir)\dvitype $(dvitype_args) trip.dvi >ctrip.typ
-	-$(diff) $(diffflags) $(testdir)\trip.typ ctrip.typ
-	@echo "*** TRIP test for e-TeX in extended mode ***."
-	-.\$(objdir)\etex -progname=einitex <$(etestdir)\etrip1.in >xtripin.fot
-	$(copy) trip.log xtripin.log & $(del) trip.log
-	-$(diff) ctripin.log xtripin.log
-	-.\$(objdir)\etex <$(etestdir)\trip2.in >xtrip.fot
-	$(copy) trip.log xtrip.log & $(del) trip.log
-	-$(diff) ctrip.fot xtrip.fot
-	-$(diff) $(diffflags) ctrip.log xtrip.log
-	.\$(objdir)\dvitype $(dvitype_args) trip.dvi >xtrip.typ
-	-$(diff) $(diffflags) ctrip.typ xtrip.typ
-	@echo "*** e-TeX specific part of e-TRIP test ***."
-	.\$(objdir)\pltotf $(etestdir)\etrip.pl etrip.tfm
-	.\$(objdir)\tftopl .\etrip.tfm etrip.pl
-	-$(diff) $(etestdir)\etrip.pl etrip.pl
-# get same filename in log
-	-$(del) \f etrip.tex & $(copy) $(etestdir:/=\)\etrip.tex . 
-	-.\$(objdir)\etex --progname=einitex <$(etestdir)\etrip2.in >etripin.fot
-	$(copy) etrip.log etripin.log & $(del) etrip.log
-	-$(diff) $(etestdir)\etripin.log etripin.log
-	-.\$(objdir)\etex <$(etestdir)\etrip3.in >etrip.fot
-	-$(diff) $(etestdir)\etrip.fot etrip.fot
-	-$(diff) $(diffflags) $(etestdir)\etrip.log etrip.log
-	set TEXMFCNF=$(TEXMFCNFOLD)
-
-# Cleaning up for the etrip.
-etrip-clean:
-	-@echo $(verbose) & ( \
-		for %%i in (trip.tfm trip.pl trip.tex trip.efmt ctripin.fot ctripin.log \
-			    ctrip.fot ctrip.log trip.dvi ctrip.typ \
-			    xtripin.fot xtripin.log \
-			    xtrip.fot xtrip.log xtrip.typ \
-			    etrip.tfm etrip.pl etrip.tex etrip.efmt etripin.fot etripin.log \
-			    etrip.fot etrip.log etrip.dvi etrip.out etrip.typ \
-			    tripos.tex 8terminal.tex) do $(del) %%i $(redir_stderr) \
-	)
-	-@$(deldir) tfm $(redir_stderr)
-
-# Distfiles ...
-# triptrapdiffs: etexdir\etrip\etrip.diffs
-# etexdir\etrip\etrip.diffs: etex
-#	$(make) etrip | tail +1 >etexdir\etrip\etrip.diffs
-
-# Dumps
-# all_efmts = etex.efmt $(efmts)
-# 
-# dumps: efmts
-# efmts: $(all_efmts)
-# 
-# etex.efmt: $(etex)
-# 	$(dumpenv) $(make) progname=etex files="etex.src plain.tex cmr10.tfm" prereq-check
-# 	$(dumpenv) .\$(objdir)\etex --progname=etex --jobname=etex --ini "*\input etex.src \dump" < nul
-# 
-# elatex.efmt: $(etex)
-# 	$(dumpenv) $(make) progname=elatex files="latex.ltx" prereq-check
-# 	$(dumpenv) .\$(objdir)\etex --progname=elatex --jobname=elatex --ini "*\input latex.ltx" < nul
-# 
-# latex.efmt: $(etex)
-# 	$(dumpenv) $(make) progname=latex files="latex.ltx" prereq-check
-# 	$(dumpenv) .\$(objdir)\etex --progname=latex --jobname=latex --ini "*\input latex.ltx" < nul
-# 
-# tex.efmt: $(etex)
-# 	$(dumpenv) $(make) progname=tex files="plain.tex cmr10.tfm" prereq-check
-# 	$(dumpenv) .\$(objdir)\etex --progname=tex --jobname=tex --ini "\input plain \dump" < nul
-# 
-# olatex.efmt: $(etex)
-# 	$(dumpenv) $(make) progname=olatex files="latex.ltx" prereq-check
-# 	$(dumpenv) .\$(objdir)\etex --progname=olatex --progname=olatex --ini "\input latex.ltx" < nul
-
-# Install
-install-etex: install-etex-exec install-etex-data
-install-etex-exec: install-etex-links
-# install-etex-data: install-etex-dumps
-install-etex-dumps: install-etex-fmts
-
-install-programs: install-etex-programs
-install-etex-programs: $(etex) $(bindir)
-	-@echo $(verbose) & ( \
-	  for %%p in ($(etex)) do $(copy) %%p $(bindir) \
-	) $(redir_stdout)
-
-# install-links: install-etex-links
-install-etex-links: install-etex-programs
-#	-@echo $(verbose) & ( \
-#	  pushd $(bindir) & \
-#	    $(del) .\einitex.exe .\evirtex.exe & \
-#	    $(lnexe) .\etex.exe $(bindir)\einitex.exe & \
-#	    $(lnexe) .\etex.exe $(bindir)\evirtex.exe & \
-#	  popd \
-#	) $(redir_stdout)
-	-@echo $(verbose) & ( \
-	  if NOT "$(efmts)"=="" \
-	    for %%i in ($(efmts)) do \
-              pushd $(bindir) & \
-                $(del) .\%%~ni.exe & \
-	        $(lnexe) .\etex.exe $(bindir)\%%~ni.exe & \
-	      popd \
-	) $(redir_stdout)
-
-# install-fmts: install-etex-fmts
-install-etex-fmts: efmts $(fmtdir)
-	-@echo $(verbose) & ( \
-	  for %%f in ($(all_efmts)) \
-	    do $(copy) %%f $(fmtdir)\%%f \
-	) $(redir_stdout)
-
-install-data:: install-etex-data
-install-etex-data: $(texpooldir)
-	@$(copy) etex.pool $(texpooldir)\etex.pool $(redir_stdout)
-
-# End of etex.mk.
-# 
-# Local variables:
-# page-delimiter: ""
-# mode: Makefile
-# End:
diff --git a/Build/source/texk/web2c/etexdir/etex.mk b/Build/source/texk/web2c/etexdir/etex.mk
deleted file mode 100644
index 4e2024a0fb1..00000000000
--- a/Build/source/texk/web2c/etexdir/etex.mk
+++ /dev/null
@@ -1,200 +0,0 @@
-# Makefile fragment for e-TeX and web2c. --infovore@xs4all.nl. Public domain.
-# This fragment contains the parts of the makefile that are most likely to
-# differ between releases of e-TeX.
-
-Makefile: etexdir/etex.mk
-
-# We build etex.
-etex = @ETEX@ etex
-
-# Extract etex version
-etexdir/etex.version: etexdir/etex.ch
-	grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
-	  | sed "s/^.*'-//;s/'.*$$//" >etexdir/etex.version
-
-# The C sources.
-etex_c = etexini.c etex0.c etex1.c etex2.c
-etex_o = etexini.o etex0.o etex1.o etex2.o etex-pool.o etexextra.o
-
-# Making etex.
-etex: $(etex_o)
-	$(kpathsea_link) $(etex_o) $(socketlibs) $(LOADLIBES)
-
-# C file dependencies
-$(etex_c) etexcoerce.h etexd.h: etex.p $(web2c_texmf)
-	$(web2c) etex
-etexextra.c: etexdir/etexextra.h lib/texmfmp.c
-	sed s/TEX-OR-MF-OR-MP/etex/ $(srcdir)/lib/texmfmp.c >$@
-etexdir/etexextra.h: etexdir/etexextra.in etexdir/etex.version
-	test -d etexdir || mkdir etexdir
-	sed s/ETEX-VERSION/`cat etexdir/etex.version`/ \
-	  $(srcdir)/etexdir/etexextra.in >$@
-
-# Tangling
-etex.p etex.pool: tangle etex.web etex.ch
-	$(TANGLE) etex.web etex.ch
-
-# Generation of the web and ch file.
-#   Sources for etex.web:
-etex_web_srcs = $(srcdir)/tex.web \
-  $(srcdir)/etexdir/etex.ch \
-  $(srcdir)/etexdir/etex.fix
-#   Sources for etex.ch:
-etex_ch_srcs = etex.web \
-  $(srcdir)/etexdir/tex.ch0 \
-  $(srcdir)/tex.ch \
-  $(srcdir)/etexdir/tex.ch1 \
-  $(srcdir)/etexdir/tex.ech \
-  $(srcdir)/etexdir/etex-binpool.ch
-#   Rules:
-etex.web: tie etexdir/etex.mk $(etex_web_srcs)
-	$(TIE) -m etex.web $(etex_web_srcs)
-etex.ch: $(etex_ch_srcs)
-	$(TIE) -c etex.ch $(etex_ch_srcs)
-
-etex-pool.c: etex.pool $(makecpool) tmf-pool.h
-	$(makecpool) etex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
-
-# Tests...
-check: @ETEX@ etex-check
-etex-check: etrip etex.fmt
-# Test truncation (but don't bother showing the warning msg).
-	./etex --progname=etex --output-comment="`cat $(srcdir)/PROJECTS`" \
-	  $(srcdir)/tests/hello 2>/dev/null \
-	  && ./dvitype hello.dvi | grep olaf@infovore.xs4all.nl >/dev/null
-# \openout should show up in \write's.
-	./etex --progname=etex $(srcdir)/tests/openout && grep xfoo openout.log
-# one.two.tex -> one.two.log
-	./etex --progname=etex $(srcdir)/tests/one.two && ls -l one.two.log
-# uno.dos -> uno.log
-	./etex --progname=etex $(srcdir)/tests/uno.dos && ls -l uno.log
-	./etex --progname=etex $(srcdir)/tests/just.texi && ls -l just.log
-	-./etex --progname=etex $(srcdir)/tests/batch.tex
-	./etex --progname=etex --shell $(srcdir)/tests/write18 | grep echo
-# tcx files are a bad idea.
-#	./etex --translate-file=$(srcdir)/share/isol1-t1.tcx \
-#	  $(srcdir)/tests/eight && ./dvitype eight.dvi >eigh.typ
-	TEXMFCNF=../kpathsea \
-	  ./etex --mltex --progname=einitex $(srcdir)/tests/mltextst
-	-./etex --progname=etex </dev/null
-	-PATH=`pwd`:$(kpathsea_dir):$(kpathsea_srcdir):$$PATH \
-	  WEB2C=$(kpathsea_srcdir) TMPDIR=.. \
-	  ./etex --progname=etex '\nonstopmode\font\foo=nonesuch\end'
-
-# Cleaning up.
-clean:: etex-clean
-etex-clean: etrip-clean
-	$(LIBTOOL) --mode=clean $(RM) etex
-	rm -f $(etex_o) $(etex_c) etexextra.c etexcoerce.h etexd.h
-	rm -f etexdir/etexextra.h etexdir/etex.version
-	rm -f etex.p etex.pool etex.web etex.ch
-	rm -f etex.fmt etex.log
-	rm -f hello.dvi hello.log xfoo.out openout.log one.two.log uno.log
-	rm -f just.log batch.log write18.log mltextst.log texput.log
-	rm -f missfont.log
-	rm -rf tfm
-
-# etrip
-etestdir = $(srcdir)/etexdir/etrip
-etestenv = TEXMFCNF=$(etestdir)
-
-triptrap: @ETEX@ etrip
-etrip: pltotf tftopl etex dvitype etrip-clean
-	@echo ">>> See $(etestdir)/etrip.diffs for example of acceptable diffs." >&2
-	@echo "*** TRIP test for e-TeX in compatibility mode ***."
-	./pltotf $(testdir)/trip.pl trip.tfm
-	./tftopl ./trip.tfm trip.pl
-	-diff $(testdir)/trip.pl trip.pl
-	$(LN) $(testdir)/trip.tex . # get same filename in log
-	-$(SHELL) -c '$(etestenv) ./etex --progname=einitex --ini <$(testdir)/trip1.in >ctripin.fot'
-	mv trip.log ctripin.log
-	-diff $(testdir)/tripin.log ctripin.log
-	-$(SHELL) -c '$(etestenv) ./etex --progname=etex <$(testdir)/trip2.in >ctrip.fot'
-	mv trip.log ctrip.log
-	-diff $(testdir)/trip.fot ctrip.fot
-	-$(DIFF) $(DIFFFLAGS) $(testdir)/trip.log ctrip.log
-	$(SHELL) -c '$(etestenv) ./dvitype $(dvitype_args) trip.dvi >ctrip.typ'
-	-$(DIFF) $(DIFFFLAGS) $(testdir)/trip.typ ctrip.typ
-	@echo "*** TRIP test for e-TeX in extended mode ***."
-	-$(SHELL) -c '$(etestenv) ./etex --progname=einitex --ini <$(etestdir)/etrip1.in >xtripin.fot'
-	mv trip.log xtripin.log
-	-diff ctripin.log xtripin.log
-	-$(SHELL) -c '$(etestenv) ./etex --progname=etex <$(etestdir)/trip2.in >xtrip.fot'
-	mv trip.log xtrip.log
-	-diff ctrip.fot xtrip.fot
-	-$(DIFF) $(DIFFFLAGS) ctrip.log xtrip.log
-	$(SHELL) -c '$(etestenv) ./dvitype $(dvitype_args) trip.dvi >xtrip.typ'
-	-$(DIFF) $(DIFFFLAGS) ctrip.typ xtrip.typ
-	@echo "*** e-TeX specific part of e-TRIP test ***."
-	./pltotf $(etestdir)/etrip.pl etrip.tfm
-	./tftopl ./etrip.tfm etrip.pl
-	-diff $(etestdir)/etrip.pl etrip.pl
-	$(LN) $(etestdir)/etrip.tex . # get same filename in log
-	-$(SHELL) -c '$(etestenv) ./etex --progname=einitex --ini <$(etestdir)/etrip2.in >etripin.fot'
-	mv etrip.log etripin.log
-	-diff $(etestdir)/etripin.log etripin.log
-	-$(SHELL) -c '$(etestenv) ./etex --progname=etex <$(etestdir)/etrip3.in >etrip.fot'
-	-diff $(etestdir)/etrip.fot etrip.fot
-	-$(DIFF) $(DIFFFLAGS) $(etestdir)/etrip.log etrip.log
-	diff $(etestdir)/etrip.out etrip.out
-	$(SHELL) -c '$(etestenv) ./dvitype $(dvitype_args) etrip.dvi >etrip.typ'
-	-$(DIFF) $(DIFFFLAGS) $(etestdir)/etrip.typ etrip.typ
-
-# Cleaning up for the etrip.
-etrip-clean:
-	rm -f trip.tfm trip.pl trip.tex trip.fmt ctripin.fot ctripin.log
-	rm -f ctrip.fot ctrip.log trip.dvi ctrip.typ
-	rm -f xtripin.fot xtripin.log
-	rm -f xtrip.fot xtrip.log xtrip.typ
-	rm -f etrip.tfm etrip.pl etrip.tex etrip.fmt etripin.fot etripin.log
-	rm -f etrip.fot etrip.log etrip.dvi etrip.out etrip.typ
-	rm -f tripos.tex 8terminal.tex
-	rm -rf tfm
-
-# Distfiles ...
-@MAINT@triptrapdiffs: etexdir/etrip/etrip.diffs
-@MAINT@etexdir/etrip/etrip.diffs: etex
-@MAINT@	$(MAKE) etrip | tail +1 >etexdir/etrip/etrip.diffs
-
-
-# Dumps
-all_efmts = etex.fmt $(efmts)
-
-dumps: @ETEX@ efmts
-efmts: $(all_efmts)
-
-efmtdir = $(web2cdir)/etex
-$(efmtdir)::
-	$(SHELL) $(top_srcdir)/../mkinstalldirs $(efmtdir)
-
-etex.fmt: etex
-	$(dumpenv) $(MAKE) progname=etex files="etex.src plain.tex cmr10.tfm" prereq-check
-	$(dumpenv) ./etex --progname=etex --jobname=etex --ini \*\\input etex.src \\dump </dev/null
-
-elatex.fmt: etex
-	$(dumpenv) $(MAKE) progname=elatex files="latex.ltx" prereq-check
-	$(dumpenv) ./etex --progname=elatex --jobname=elatex --ini \*\\input latex.ltx </dev/null
-
-latex.fmt: etex
-	$(dumpenv) $(MAKE) progname=latex files="latex.ltx" prereq-check
-	$(dumpenv) ./etex --progname=latex --jobname=latex --ini \*\\input latex.ltx </dev/null
-
-#ctex.fmt: etex
-#	$(dumpenv) $(MAKE) progname=ctex files="plain.tex cmr10.tfm" prereq-check
-#	$(dumpenv) ./etex --progname=ctex --jobname=ctex --ini \\input plain \\dump </dev/null
-
-#olatex.fmt: etex
-#	$(dumpenv) $(MAKE) progname=olatex files="latex.ltx" prereq-check
-#	$(dumpenv) ./etex --progname=olatex --progname=olatex --ini \\input latex.ltx </dev/null
-
-# 
-# Installation -- nothing by default, that is, we omit the
-# install-programs target.  We want to make etex a symlink to pdftex,
-# via texlinks.  Leave this unused install-etex* targets just to show
-# that the real binary does get built and can be used if desired.
-
-install-etex: install-etex-exec
-install-etex-exec: etex $(bindir)
-	for p in etex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-
-# end of etex.mk
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index e6308175c95..025a79313dc 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* pdftex.mak, pdftex.mk (removed): Obsolete.
+
 2011-01-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/pdftex.am (pdftex_ch_srcs): Added enctex.ch.
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index b799c459671..f64ba4ac1f6 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -97,12 +97,3 @@ if PDFTEX
 TESTS += $(pdftex_tests)
 endif PDFTEX
 
-## Not used
-##
-EXTRA_DIST += pdftexdir/pdftex.mak
-
-## Eventually delete these files
-##
-EXTRA_DIST += \
-	pdftexdir/pdftex.mk
-
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.mak b/Build/source/texk/web2c/pdftexdir/pdftex.mak
deleted file mode 100644
index 1acfb87c4e9..00000000000
--- a/Build/source/texk/web2c/pdftexdir/pdftex.mak
+++ /dev/null
@@ -1,199 +0,0 @@
-################################################################################
-#
-# Makefile  : pdftex, web2c win32.mak fragment to build pdfTeX
-# Author    : Fabrice Popineau <Fabrice.Popineau@supelec.fr>
-# Platform  : Win32, Microsoft VC++ 6.0, depends upon fpTeX 0.5 sources
-# Time-stamp: <04/03/20 16:40:35 popineau>
-#
-################################################################################
-
-# The libraries are not mentioned.  As the matter stands, a change in their
-# number or how they are configured requires changes to the main distribution
-# anyway.
-
-Makefile: pdftexdir\pdftex.mk
-
-pdftex_bin = $(objdir)\pdftex.exe $(objdir)\pdfetex.exe $(objdir)\ttf2afm.exe $(objdir)\pdftosrc.exe
-# pdftex_exe = pdftex.exe pdfetex.exe ttf2afm.exe pdftosrc.exe
-pdftex_pool = pdftex.pool pdfetex.pool
-# linux_build_dir = $(HOME)\pdftex\build\linux\texk\web2c
-
-# We build pdftex
-pdftex = $(objdir)\pdftex.exe
-!ifdef TEX_DLL
-pdftex = $(pdftex) $(objdir)\$(library_prefix)pdftex.dll
-!endif
-
-# The C sources.
-pdftex_c = pdftex.c
-pdftex_o = $(objdir)\pdftex.obj
-
-# Making pdftex
-!ifdef TEX_DLL
-$(objdir)\$(library_prefix)pdftex.exp: $(objdir)\$(library_prefix)pdftex.lib
-
-$(objdir)\$(library_prefix)pdftex.lib: $(pdftex_o)
-	$(archive) /DEF $(pdftex_o)
-
-$(objdir)\$(library_prefix)pdftex.dll: $(pdftex_o) $(objdir)\$(library_prefix)pdftex.exp $(objdir)\pdftex.res $(pdftexlibs) $(kpathsealib) $(proglib)
-	$(link_dll) $(**) $(socketlibs) $(conlibs)
-
-$(objdir)\pdftex.exe: $(objdir)\win32main.obj $(objdir)\$(library_prefix)pdftex.lib $(kpathsealib) $(proglib)
-	$(link) $(**) $(conlibs)
-!else
-$(objdir)\pdftex.exe: $(pdftex_o) $(objdir)\win32main.obj $(objdir)\pdftex.res $(pdftexlibs) $(kpathsealib) $(proglib)
-	$(link) $(**) $(socketlibs) $(conlibs)
-!endif
-
-# C file dependencies.
-$(pdftex_c) pdftexcoerce.h pdftexd.h: pdftex.p $(web2c_texmf)
-	$(web2c) pdftex
-
-# Tangling.
-pdftex.p pdftex.pool: .\$(objdir)\tangle.exe pdftex.web pdftex.ch
-	.\$(objdir)\tangle pdftex.web pdftex.ch
-
-# Generation of the web and ch files.
-pdftex.web: $(objdir)\tie.exe \
-	tex.web \
-        pdftexdir/pdftex.ch \
-        pdftexdir/hz.ch \
-        pdftexdir/misc.ch \
-	# pdftexdir\pdftex.mak
-	.\$(objdir)\tie -m pdftex.web tex.web \
-	pdftexdir\pdftex.ch \
-	$(srcdir)/pdftexdir/hz.ch  \
-	$(srcdir)/pdftexdir/misc.ch
-
-pdftex.ch: $(objdir)\tie.exe pdftex.web	\
-	   pdftexdir\tex.ch0		\
-	   tex.ch			\
-	   tex-supp-w32.ch		\
-	   pdftexdir\tex.ch1		\
-	   pdftexdir\tex.pch		\
-	   pdftexdir\tex.ch2
-#	   pdftexdir\pdftex.mak
-	.\$(objdir)\tie -c pdftex.ch    \
-	   pdftex.web 			\
-	   $(srcdir)\pdftexdir\tex.ch0	\
-	   tex.ch			\
-	   tex-supp-w32.ch		\
-	   $(srcdir)\pdftexdir\tex.ch1	\
-	   $(srcdir)\pdftexdir\tex.pch	\
-	   $(srcdir)\pdftexdir\tex.ch2
-
-# Tests...
-check: pdftex-check
-pdftex-check: pdftex pdftex.fmt
-
-# Cleaning up.
-clean:: pdftex-clean
-pdftex-clean:
-#	$(LIBTOOL) --mode=clean $(RM) pdftex
-	-@echo $(verbose) & ( \
-		for %%i in ($(pdftex_o) $(pdftex_c) pdftexextra.c pdftexcoerce.h \
-			    pdftexd.h pdftex.p pdftex.pool pdftex.web pdftex.ch \
-                            pdftex.fmt pdftex.log) do $(del) %%i $(redir_stderr) \
-	)
-
-# Dumps.
-# all_pdffmts = pdftex.fmt $(pdffmts)
-
-# dumps: pdffmts
-# pdffmts: $(all_pdffmts)
-# pdftex.fmt: $(pdftex)
-# 	$(dumpenv) $(make) progname=pdftex files="plain.tex cmr10.tfm" prereq-check
-# 	$(dumpenv) .\$(objdir)\pdftex --progname=pdftex --jobname=pdftex --ini "\pdfoutput=1 \input plain \dump" <nul
-# 
-# pdfolatex.fmt: $(pdftex)
-# 	$(dumpenv) $(make) progname=pdfolatex files="latex.ltx" prereq-check
-# 	$(dumpenv) .\$(objdir)\pdftex --progname=pdfolatex --jobname=pdfolatex --ini "\pdfoutput=1 \input latex.ltx" <nul
-# 
-# pdflatex.fmt: $(pdftex)
-# 	$(dumpenv) $(make) progname=pdflatex files="latex.ltx" prereq-check
-# 	$(dumpenv) .\$(objdir)\pdftex --progname=pdflatex --jobname=pdflatex --ini "\pdfoutput=1 \input latex.ltx" <nul
-# 
-# 
-# Installation.
-install-pdftex: install-pdftex-exec install-pdftex-data
-install-pdftex-exec: install-pdftex-links
-# install-pdftex-data: install-pdftex-dumps
-install-pdftex-dumps: install-pdftex-fmts
-
-# The actual binary executables and pool files.
-install-programs: install-pdftex-programs
-install-pdftex-programs: $(pdftex) $(bindir)
-	-@echo $(verbose) & ( \
-	  for %%p in ($(pdftex)) do $(copy) %%p $(bindir) \
-	) $(redir_stdout)
-
-# install-links: install-pdftex-links
-install-pdftex-links: install-pdftex-programs
-# 	-@echo $(verbose) & ( \
-# 	  pushd $(bindir) & \
-# 	    $(del) .\pdfinitex.exe .\pdfvirtex.exe & \
-# 	    $(lnexe) .\pdftex.exe $(bindir)\pdfinitex.exe & \
-# 	    $(lnexe) .\pdftex.exe $(bindir)\pdfvirtex.exe & \
-# 	 popd \
-# 	) $(redir_stdout)
-	-@echo $(verbose) & ( \
-	  if not "$(pdffmts)"=="" \
-	    for %%i in ($(pdffmts)) do \
-              pushd $(bindir) & \
-                $(del) .\%%~ni.exe & \
-	        $(lnexe) .\pdftex.exe $(bindir)\%%~ni.exe & \
-	      popd \
-	) $(redir_stdout)
-
-# install-fmts: install-pdftex-fmts
-install-pdftex-fmts: pdffmts $(fmtdir)
-	-@echo $(verbose) & ( \
-	  for %%f in ($(all_pdffmts)) \
-	    do $(copy) %%f $(fmtdir)\%%f \
-	) $(redir_stdout)
-
-# Auxiliary files.
-install-data:: install-pdftex-data
-install-pdftex-data: $(texpooldir)
-	@$(copy) pdftex.pool $(texpooldir)\pdftex.pool $(redir_stdout)
-
-# 
-# ttf2afm
-ttf2afm = $(objdir)\ttf2afm.exe
-
-$(objdir)\ttf2afm.exe: $(objdir)\ttf2afm.obj
-	$(link) $(**) $(kpathsealib) $(proglib) $(conlibs)
-
-$(objdir)\ttf2afm.obj: pdftexdir\ttf2afm.c pdftexdir\macnames.c
-	$(compile) -I.\pdftexdir pdftexdir\ttf2afm.c
-check: ttf2afm-check
-ttf2afm-check: $(objdir)\ttf2afm.exe
-clean:: ttf2afm-clean
-ttf2afm-clean:
-#	$(LIBTOOL) --mode=clean $(RM) ttf2afm
-	-@echo $(verbose) & ( \
-		for %%i in ($(objdir)\ttf2afm.obj $(objdir)\macnames.obj \
-			    ttf2afm.c macnames.c) do $(del) %%i $(redir_stderr) \
-	)
-# 
-# pdftosrc
-pdftosrc = $(objdir)\pdftosrc.exe
-
-$(objdir)\pdftosrc.exe: $(objdir)\pdftosrc.obj $(xpdflib)
-	$(link) $(objdir)\pdftosrc.obj $(xpdflib) $(kpathsealib) $(proglib) $(conlibs)
-
-$(objdir)\pdftosrc.obj: pdftexdir\pdftosrc.cc
-	$(compile) /Tp $(**)
-check: pdftosrc-check
-pdftosrc-check: $(objdir)\pdftosrc.exe
-clean:: pdftosrc-clean
-pdftosrc-clean:
-#	$(LIBTOOL) --mode=clean $(RM) pdftosrc
-	-@$(del) $(objdir)\pdftosrc.obj $(redir_stderr)
-
-# end of pdftex.mak
-#  
-# Local variables:
-# page-delimiter: "^# \f"
-# mode: Makefile
-# End:
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.mk b/Build/source/texk/web2c/pdftexdir/pdftex.mk
deleted file mode 100644
index ffad3485375..00000000000
--- a/Build/source/texk/web2c/pdftexdir/pdftex.mk
+++ /dev/null
@@ -1,176 +0,0 @@
-# Makefile fragment for pdfeTeX and web2c. --infovore@xs4all.nl. Public domain.
-# This fragment contains the parts of the makefile that are most likely to
-# differ between releases of pdfeTeX.
-
-# We build pdftex
-pdftex = @PETEX@ pdftex
-pdftexdir = pdftexdir
-
-LIBOBSDCOMPATDIR=../../libs/obsdcompat
-LIBOBSDCOMPATSRCDIR=$(srcdir)/$(LIBOBSDCOMPATDIR)
-XCPPFLAGS=-I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATSRCDIR) -I$(LIBOBSDCOMPATSRCDIR)/.. -I$(ZLIBSRCDIR)
-
-Makefile: $(srcdir)/$(pdftexdir)/pdftex.mk
-
-pdftex_bin = pdftex ttf2afm pdftosrc
-linux_build_dir = $(HOME)/pdftex/build/linux/texk/web2c
-
-# Extract pdftex version
-$(pdftexdir)/pdftex.version: $(srcdir)/$(pdftexdir)/pdftex.web
-	test -d $(pdftexdir) || mkdir $(pdftexdir)
-	grep '^@d pdftex_version_string==' $(srcdir)/$(pdftexdir)/pdftex.web \
-	  | sed "s/^.*'-//;s/'.*$$//" \
-	  >$(pdftexdir)/pdftex.version
-
-# The C sources.
-pdftex_c = pdftexini.c pdftex0.c pdftex1.c pdftex2.c pdftex3.c
-pdftex_o = pdftexini.o pdftex0.o pdftex1.o pdftex2.o pdftex3.o pdftexextra.o \
-pdftex-pool.o $(pdftex_o-with_synctex)
-
-# Making pdftex
-pdftex: pdftexd.h $(pdftex_o) $(pdftexextra_o) $(pdftexlibsdep)
-	@CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@
-
-# C file dependencies.
-$(pdftex_c) pdftexcoerce.h pdftexd.h: pdftex.p $(web2c_texmf) $(srcdir)/$(pdftexdir)/pdftex.defines $(srcdir)/$(pdftexdir)/pdftex.h
-	$(web2c) pdftex
-	$(pdftexd.h-with_synctex)
-pdftexextra.c: pdftexd.h $(pdftexdir)/pdftexextra.h lib/texmfmp.c
-	test -d $(pdftexdir) || mkdir $(pdftexdir)
-	sed s/TEX-OR-MF-OR-MP/pdftex/ $(srcdir)/lib/texmfmp.c >$@
-$(pdftexdir)/pdftexextra.h: $(pdftexdir)/pdftexextra.in $(pdftexdir)/pdftex.version etexdir/etex.version
-	test -d $(pdftexdir) || mkdir $(pdftexdir)
-	sed -e s/PDFTEX-VERSION/`cat $(pdftexdir)/pdftex.version`/ \
-	    -e s/ETEX-VERSION/`cat etexdir/etex.version`/ \
-	  $(srcdir)/$(pdftexdir)/pdftexextra.in >$@
-pdftex-pool.c: pdftex.pool $(makecpool)
-	$(makecpool) pdftex.pool pdftexdir/ptexlib.h >$@ || rm -f $@
-
-# Tangling
-pdftex.p pdftex.pool: tangle $(srcdir)/$(pdftexdir)/pdftex.web pdftex.ch
-	$(TANGLE) $(srcdir)/$(pdftexdir)/pdftex.web pdftex.ch
-
-#   Sources for pdftex.ch:
-pdftex_ch_srcs = $(srcdir)/$(pdftexdir)/pdftex.web \
-  $(srcdir)/$(pdftexdir)/tex.ch0 \
-  $(srcdir)/tex.ch \
-  $(pdftex_ch_srcs-with_synctex) \
-  $(srcdir)/$(pdftexdir)/pdftex.ch
-#   Rules:
-pdftex.ch: $(TIE) $(pdftex_ch_srcs)
-	$(TIE) -c pdftex.ch $(pdftex_ch_srcs)
-
-# pdfetex: (it's just a copy of pdftex)
-pdfetex: pdftex
-	cp -p pdftex pdfetex
-pdfetex.pool: pdftex.pool
-	cp -p pdftex.pool pdfetex.pool
-
-# for developing only
-pdftex-org.web: $(TIE) $(pdftex_ch_srcs_org)
-	$(TIE) -m $@ $(pdftex_ch_srcs_org)
-pdftex-all.web: $(TIE) $(srcdir)/$(pdftexdir)/pdftex.web pdftex.ch
-	$(TIE) -m $@ $(srcdir)/$(pdftexdir)/pdftex.web pdftex.ch
-pdftex-all.tex: pdftex-all.web
-	$(WEAVE) pdftex-all.web
-	{ echo '1s/ webmac/ pdfwebmac/'; echo w; echo q;} | ed $@ >/dev/null 2>&1
-pdftex-all.pdf: pdftex-all.tex
-	$(pdftex) pdftex-all.tex
-
-check: @PETEX@ pdftex-check
-pdftex-check: pdftex pdftex.fmt
-
-clean:: pdftex-clean
-pdftex-clean:
-	$(LIBTOOL) --mode=clean $(RM) pdftex
-	rm -f $(pdftex_o) $(pdftex_c) pdftexextra.c pdftexcoerce.h
-	rm -f $(pdftexdir)/pdftexextra.h
-	rm -f pdftexd.h pdftex.p pdftex.pool pdftex.ch
-	rm -f pdftex.fmt pdftex.log
-
-# Dumps
-all_pdfefmts = @FMU@ pdfetex.fmt $(pdfefmts)
-
-dumps: @PETEX@ pdfefmts
-pdfefmts: $(all_pdfefmts)
-
-pdfefmtdir = $(web2cdir)/pdfetex
-$(pdfefmtdir)::
-	$(SHELL) $(top_srcdir)/../mkinstalldirs $(pdfefmtdir)
-
-pdfetex.fmt: pdfetex
-	$(dumpenv) $(MAKE) progname=pdfetex files="etex.src plain.tex cmr10.tfm" prereq-check
-	$(dumpenv) ./pdfetex --progname=pdfetex --jobname=pdfetex --ini \*\\pdfoutput=1\\input etex.src \\dump </dev/null
-
-pdflatex.fmt: pdftex
-	$(dumpenv) $(MAKE) progname=pdflatex files="latex.ltx" prereq-check
-	$(dumpenv) ./pdftex --progname=pdflatex --jobname=pdflatex --ini \*\\pdfoutput=1\\input latex.ltx </dev/null
-
-# 
-# Installation.
-install-pdftex: install-pdftex-exec
-install-programs: @PETEX@ install-pdftex-exec
-install-pdftex-exec: $(pdftex) $(bindir)
-	for p in pdftex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-
-# 
-# ttf2afm
-ttf2afm = ttf2afm
-
-ttf2afm: ttf2afm.o
-	$(kpathsea_link) ttf2afm.o $(kpathsea)
-ttf2afm.o: ttf2afm.c macnames.c
-	$(compile) -c $< -o $@
-ttf2afm.c: $(srcdir)/$(pdftexdir)/ttf2afm.c
-	cp $(srcdir)/$(pdftexdir)/ttf2afm.c .
-macnames.c: $(srcdir)/$(pdftexdir)/macnames.c
-	cp $(srcdir)/$(pdftexdir)/macnames.c .
-check: ttf2afm-check
-ttf2afm-check: ttf2afm
-clean:: ttf2afm-clean
-ttf2afm-clean:
-	$(LIBTOOL) --mode=clean $(RM) ttf2afm
-	rm -f ttf2afm.o macnames.o
-	rm -f ttf2afm.c macnames.c
-# 
-# pdftosrc
-pdftosrc = pdftosrc
-
-pdftosrc: $(pdftexdir)/pdftosrc.o $(LIBXPDFDEP)
-	@CXXHACKLINK@ $(pdftexdir)/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@
-$(pdftexdir)/pdftosrc.o:$(srcdir)/$(pdftexdir)/pdftosrc.cc
-	cd $(pdftexdir) && $(MAKE) pdftosrc.o
-check: pdftosrc-check
-pdftosrc-check: pdftosrc
-clean:: pdftosrc-clean
-pdftosrc-clean:
-	$(LIBTOOL) --mode=clean $(RM) pdftosrc
-# 
-# pdftex binaries archive
-pdftexbin:
-	$(MAKE) $(pdftex_bin)
-
-pdftex-cross:
-	$(MAKE) pdftex-web2c-cross
-	$(MAKE) pdftexbin
-
-pdftex-web2c-cross: $(web2c_programs)
-	@if test ! -x $(linux_build_dir)/tangle; then echo Error: linux_build_dir not ready; exit -1; fi
-	rm -f web2c/fixwrites web2c/splitup web2c/web2c
-	cp -f $(linux_build_dir)/web2c/fixwrites web2c
-	cp -f $(linux_build_dir)/web2c/splitup web2c
-	cp -f $(linux_build_dir)/web2c/web2c web2c
-	touch web2c/fixwrites web2c/splitup web2c/web2c
-	$(MAKE) tangleboot && rm -f tangleboot && \
-	cp -f $(linux_build_dir)/tangleboot .  && touch tangleboot
-	$(MAKE) ctangleboot && rm -f ctangleboot && \
-	cp -f $(linux_build_dir)/ctangleboot .  && touch ctangleboot
-	$(MAKE) ctangle && rm -f ctangle && \
-	cp -f $(linux_build_dir)/ctangle .  && touch ctangle
-	$(MAKE) tie && rm -f tie && \
-	cp -f $(linux_build_dir)/tie .  && touch tie
-	$(MAKE) tangle && rm -f tangle && \
-	cp -f $(linux_build_dir)/tangle .  && touch tangle
-
-# vim: set noexpandtab
-# end of pdftex.mk