summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/am
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-11-10 10:27:09 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-11-10 10:27:09 +0000
commit5e8e9500102800e68c9e7fcac9e85c1668b71a36 (patch)
tree81d79ac70ffbb127e8063f18c8f55475ca169ee1 /Build/source/texk/web2c/am
parente6a9c88ada2f11dd61e4c4e39dff84944bed5787 (diff)
towards TL2010: texk/web2c
git-svn-id: svn://tug.org/texlive/trunk@15964 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/am')
-rw-r--r--Build/source/texk/web2c/am/bootstrap.am101
-rw-r--r--Build/source/texk/web2c/am/cweb.am7
-rw-r--r--Build/source/texk/web2c/am/texmf.am78
-rw-r--r--Build/source/texk/web2c/am/web.am117
4 files changed, 132 insertions, 171 deletions
diff --git a/Build/source/texk/web2c/am/bootstrap.am b/Build/source/texk/web2c/am/bootstrap.am
index e7191ae311a..13bf32dfd56 100644
--- a/Build/source/texk/web2c/am/bootstrap.am
+++ b/Build/source/texk/web2c/am/bootstrap.am
@@ -4,20 +4,20 @@
## 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.
+# to create an up-to-date tangleboot.pin as well.
bin_PROGRAMS += tangle
nodist_tangle_SOURCES = tangle.c tangle.h
tangle.c tangle.h: tangle-web2c
-tangle-web2c: tangle.p
- $(web2c) tangle
- echo timestamp >$@
- touch tangle.c tangle.h
+ @$(web2c) tangle
+tangle-web2c: tangle.p $(web2c_depend)
+ @$(web2c) tangle
# 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
+# convert and compile the (distributed) tangleboot.pin 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
+ cmp -s tangle.p $(srcdir)/tangleboot.pin || cp -f tangle.p $(srcdir)/tangleboot.pin
tangle.web:
@echo "You seem to be missing tangle.web, perhaps because you" >&2
@echo "didn't retrieve web.tar.gz, only web2c.tar.gz." >&2
@@ -33,73 +33,48 @@ 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_depend)
- $(web2c) tangleboot
-# tangleboot.p is in the distribution
-stamp-tangle: tangleboot.p
- date >stamp-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; \
- mv tangle.p tangleboot.p; \
- elif [ -r tangleboot.p ]; then \
- touch tangleboot.p; \
- else \
- cp $(srcdir)/tangleboot.p .; \
- fi
- date >stamp-tangle
- $(MAKE) $(AM_MAKEFLAGS) tangle$(EXEEXT)
-DISTCLEANFILES += stamp-tangle tangleboot.c tangleboot.h
+tangleboot.c tangleboot.h: tangleboot-web2c
+ @$(web2c) tangleboot
+tangleboot-web2c: tangleboot.p $(web2c_depend)
+ @$(web2c) tangleboot
+# tangleboot.pin is in the distribution
+tangleboot.p:
+ cp -f $(srcdir)/$@in $@
+tangleboot_DEPENDENCIES = $(default_dependencies)
+EXTRA_DIST += tangleboot.pin
+DISTCLEANFILES += tangleboot.c tangleboot.h tangleboot.p tangleboot-web2c
# Bootstrapping ctangle requires making it with itself. We use the opportunity
-# to create an up-to-date ctangleboot.c and cwebboot.c as well.
+# to create an up-to-date ctangleboot.cin and cwebboot.[ch]in 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.
-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
+$(ctangle_OBJECTS): cweb.h
+ctangle_CFLAGS = $(WARNING_CFLAGS)
+# ctangle.c and cweb.[ch] are special cases, since they are needed to compile
+# themselves. We depend on ctangleboot, even though we might not use it.
+ctangleboot = $(SHELL) ./ctangleboot-sh $@
+ctangle.c: ctangle-ctangle
+ @$(ctangleboot) ctangle ctang-w2c
+ctangle-ctangle: ctangleboot$(EXEEXT) cwebdir/common.h cwebdir/ctangle.w cwebdir/ctang-w2c.ch ctangleboot-sh
+ @$(ctangleboot) ctangle ctang-w2c
+cweb.c cweb.h: common-ctangle
+ @$(ctangleboot) common comm-w2c cweb.c
+common-ctangle: ctangleboot$(EXEEXT) cwebdir/common.w cwebdir/comm-w2c.ch ctangleboot-sh
+ @$(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
+DISTCLEANFILES += ctangle.c cweb.c cweb.h ctangle-ctangle common-ctangle
noinst_PROGRAMS += ctangleboot
nodist_ctangleboot_SOURCES = ctangleboot.c cwebboot.c
-# ctangleboot.c and cwebboot.c are in the distribution
-$(ctangleboot_OBJECTS): stamp-ctangle
-stamp-ctangle: ctangleboot.c cwebboot.c
- date >stamp-ctangle
-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 ctangleboot.c; \
- elif [ -r ctangleboot.c ]; then \
- touch ctangleboot.c; \
- else \
- cp $(srcdir)/ctangleboot.c .; \
- fi
- date >stamp-ctangle
- $(MAKE) $(AM_MAKEFLAGS) ctangle$(EXEEXT)
-cwebboot.c: cwebdir/common.w cwebdir/comm-w2c.ch
- if [ -r $(CTANGLE) ] || [ -r $(CTANGLE).exe ]; then \
- CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) common comm-w2c cwebboot.c; \
- elif [ -r cwebboot.c ]; then \
- touch cwebboot.c; \
- else \
- cp $(srcdir)/cwebboot.c .; \
- fi
-DISTCLEANFILES += stamp-ctangle
+$(ctangleboot_OBJECTS): cwebboot.h
+# ctangleboot.cin and cwebboot.[ch]in are in the distribution
+ctangleboot.c cwebboot.c cwebboot.h:
+ cp -f $(srcdir)/$@in $@
+ctangleboot_DEPENDENCIES = $(default_dependencies)
+EXTRA_DIST += ctangleboot.cin cwebboot.cin cwebboot.hin
+DISTCLEANFILES += ctangleboot.c cwebboot.c cwebboot.h
## Tests
##
diff --git a/Build/source/texk/web2c/am/cweb.am b/Build/source/texk/web2c/am/cweb.am
index e7c082c4798..689c3cae47d 100644
--- a/Build/source/texk/web2c/am/cweb.am
+++ b/Build/source/texk/web2c/am/cweb.am
@@ -7,17 +7,22 @@ bin_PROGRAMS += ctie cweave tie
EXTRA_DIST += ctiedir tiedir
nodist_ctie_SOURCES = ctie.c
+ctie_CFLAGS = $(WARNING_CFLAGS)
nodist_man_MANS += ctiedir/ctie.1
ctie.c: ctangle$(EXEEXT) ctiedir/ctie.w ctiedir/ctie-k.ch
CWEBINPUTS=$(srcdir)/ctiedir $(ctangle) ctie.w ctie-k.ch
DISTCLEANFILES += ctie.c
nodist_cweave_SOURCES = cweave.c cweb.c
-cweave.c: ctangle$(EXEEXT) cwebdir/cweave.w cwebdir/cweav-w2c.ch
+$(cweave_OBJECTS): cweb.h
+cweave_CFLAGS = $(WARNING_CFLAGS)
+cweave.c: ctangle$(EXEEXT) cwebdir/common.h cwebdir/cweave.w cwebdir/cweav-w2c.ch
CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) cweave cweav-w2c
DISTCLEANFILES += cweave.c
nodist_tie_SOURCES = tie.c
+tie_CPPFLAGS = -DNOT_WEB2C
+tie_CFLAGS = $(WARNING_CFLAGS)
nodist_man_MANS += tiedir/tie.1
tie.c: ctangle$(EXEEXT) tiedir/tie.w tiedir/tie-w2c.ch
CWEBINPUTS=$(srcdir)/tiedir $(ctangle) tie.w tie-w2c.ch
diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am
index fe256a3e7ec..a5c9b791525 100644
--- a/Build/source/texk/web2c/am/texmf.am
+++ b/Build/source/texk/web2c/am/texmf.am
@@ -20,38 +20,37 @@ endif TEX
EXTRA_PROGRAMS += tex
tex_CPPFLAGS =
+tex_CFLAGS = $(WARNING_CFLAGS)
# 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
+tex_c_h = texini.c tex0.c texcoerce.h texd.h
nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c
# We must create texd.h before building the tex_OBJECTS.
-$(tex_OBJECTS): texd.h
+tex_prereq = texd.h
+$(tex_OBJECTS): $(tex_prereq)
$(tex_c_h): tex-web2c
+ @$(web2c) tex
tex-web2c: tex.p $(web2c_texmf)
- $(web2c) tex
- : $(synctex_convert_tex)
- echo timestamp >$@
- touch $(tex_c_h)
+ @$(web2c) tex
-tex-pool.c: tex.pool $(makecpool_stamp) tmf-pool.h
- $(makecpool) tex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
+tex-pool.c: tex.pool texd.h $(makecpool_stamp)
+ $(makecpool) tex >$@ || 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$(EXEEXT) tex.web tex-final.ch
- $(tangle) tex.web tex-final.ch
- echo timestamp >$@
- touch tex.p tex.pool
+ @$(texmf_tangle) tex tex-final
+tex-tangle: tangle$(EXEEXT) tex.web tex-final.ch tangle-sh
+ @$(texmf_tangle) tex tex-final
-## Generate tex-final.ch
+# Generate tex-final.ch
tex-final.ch: tie$(EXEEXT) $(tex_ch_srcs)
$(tie) -c $@ $(tex_ch_srcs)
tex_ch_srcs = \
@@ -65,8 +64,8 @@ EXTRA_DIST += $(tex_ch_srcs) lib/texmfmp.c tmf-pool.h
DISTCLEANFILES += $(nodist_tex_SOURCES) tex-final.ch tex-web2c \
tex.p tex.pool tex-tangle
-## TeX Tests
-##
+# TeX Tests
+#
tex_tests = trip.test
EXTRA_DIST += $(tex_tests)
@@ -78,7 +77,7 @@ endif TEX
.PHONY: trip-clean
clean-local:: trip-clean
-## trip.test
+# trip.test
trip-clean:
rm -f trip.tfm trip.pl trip.tex trip.fmt tripin.fot tripin.log
rm -f trip.fot trip.log trip.dvi trip.typ tripos.tex 8terminal.tex
@@ -96,23 +95,23 @@ EXTRA_PROGRAMS += mf mf-nowin
nodist_mf_SOURCES = mfextra.c
mf_CPPFLAGS = $(X_CFLAGS)
+mf_CFLAGS = $(WARNING_CFLAGS)
mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs)
-if MFN
nodist_mf_nowin_SOURCES = mfextra.c
mf_nowin_CPPFLAGS = $(X_CFLAGS) -DMFNOWIN
+mf_nowin_CFLAGS = $(WARNING_CFLAGS)
mf_nowin_LDADD = libmf.a $(LDADD) $(windowlib)
-endif MFN
windowlib = window/libwindow.a
$(windowlib): mfd.h $(srcdir)/window/*.c
cd window && $(MAKE) $(AM_MAKEFLAGS) libwindow.a
-## Make `#include <X11/...>' and `-lX...' work.
-## This matches xdvik.
-## wlibs is substituted by web2c's configure, LIBS by general configure
-## routines, and the others by AC_PATH_XTRA.
-## All the x_... and X_... variables will be empty if we aren't supporting X.
-## Follow the library order used in X11R6 itself:
-## -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present).
+# Make `#include <X11/...>' and `-lX...' work.
+# This matches xdvik.
+# wlibs is substituted by web2c's configure, LIBS by general configure
+# routines, and the others by AC_PATH_XTRA.
+# All the x_... and X_... variables will be empty if we aren't supporting X.
+# Follow the library order used in X11R6 itself:
+# -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present).
mf_x_libs = $(X_LIBS) $(x_tool_libs) $(X_PRE_LIBS) $(x_ext_lib) $(wlibs) $(X_EXTRA_LIBS)
## mf and mf-nowin compile mfextra.c with different CPPFLAGS.
@@ -121,31 +120,30 @@ mf_x_libs = $(X_LIBS) $(x_tool_libs) $(X_PRE_LIBS) $(x_ext_lib) $(wlibs) $(X_EXT
EXTRA_LIBRARIES += libmf.a
# Metafont C sources
-mf_c_h = mfini.c mf0.c mf1.c mfcoerce.h mfd.h
+mf_c_h = mfini.c mf0.c mfcoerce.h mfd.h
nodist_libmf_a_SOURCES = $(mf_c_h) mf-pool.c
libmf_a_CPPFLAGS = -DMETA_FONT
+libmf_a_CFLAGS = $(WARNING_CFLAGS)
# We must create mfd.h before building the libmf_a_OBJECTS.
$(libmf_a_OBJECTS): mfd.h
$(mf_c_h): mf-web2c
+ @$(web2c) mf
mf-web2c: mf.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed
- $(web2c) mf
- echo timestamp >$@
- touch $(mf_c_h)
+ @$(web2c) mf
-mf-pool.c: mf.pool $(makecpool_stamp) tmf-pool.h
- $(makecpool) mf.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
+mf-pool.c: mf.pool mfd.h $(makecpool_stamp)
+ $(makecpool) mf >$@ || 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$(EXEEXT) mf.web mf-final.ch
- $(tangle) mf.web mf-final.ch
- echo timestamp >$@
- touch mf.p mf.pool
+ @$(texmf_tangle) mf mf-final
+mf-tangle: tangle$(EXEEXT) mf.web mf-final.ch tangle-sh
+ @$(texmf_tangle) mf mf-final
# Generate mf-final.ch
mf-final.ch: tie$(EXEEXT) mf.web mf.ch mf-binpool.ch
@@ -156,8 +154,8 @@ 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
-## Metafont Tests
-##
+# Metafont Tests
+#
mf_tests = trap.test
EXTRA_DIST += $(mf_tests)
@@ -169,7 +167,7 @@ endif MF
.PHONY: trap-clean
clean-local:: trap-clean
-## trap.test
+# trap.test
trap-clean:
rm -f trap.mf trap.base
rm -f mftrapin.fot mftrapin.log
@@ -228,3 +226,7 @@ EXTRA_DIST += \
triptrap/writeo \
triptrap/writeo.2
+## Eventually delete these files
+##
+EXTRA_DIST += tmf-pool.h
+
diff --git a/Build/source/texk/web2c/am/web.am b/Build/source/texk/web2c/am/web.am
index f678cb5b988..a587967eb1a 100644
--- a/Build/source/texk/web2c/am/web.am
+++ b/Build/source/texk/web2c/am/web.am
@@ -17,150 +17,133 @@ DISTCLEANFILES += $(web_programs:=.c) $(web_programs:=.h) \
nodist_bibtex_SOURCES = bibtex.c bibtex.h
bibtex.c bibtex.h: bibtex-web2c
-bibtex-web2c: $(web2c_depend) web2c/cvtbib.sed bibtex.p
- $(web2c) bibtex
- echo timestamp >$@
- touch bibtex.c bibtex.h
+ @$(web2c) bibtex
+bibtex-web2c: bibtex.p $(web2c_depend) web2c/cvtbib.sed
+ @$(web2c) bibtex
bibtex.p: tangle$(EXEEXT) bibtex.web bibtex.ch
$(tangle) bibtex bibtex
nodist_dvicopy_SOURCES = dvicopy.c dvicopy.h
dvicopy.c dvicopy.h: dvicopy-web2c
-dvicopy-web2c: $(web2c_depend) dvicopy.p
- $(web2c) dvicopy
- echo timestamp >$@
- touch dvicopy.c dvicopy.h
+ @$(web2c) dvicopy
+dvicopy-web2c: dvicopy.p $(web2c_depend)
+ @$(web2c) dvicopy
dvicopy.p: tangle$(EXEEXT) dvicopy.web dvicopy.ch
$(tangle) dvicopy dvicopy
nodist_dvitype_SOURCES = dvitype.c dvitype.h
dvitype.c dvitype.h: dvitype-web2c
-dvitype-web2c: $(web2c_depend) dvitype.p
- $(web2c) dvitype
- echo timestamp >$@
- touch dvitype.c dvitype.h
+ @$(web2c) dvitype
+dvitype-web2c: dvitype.p $(web2c_depend)
+ @$(web2c) dvitype
dvitype.p: tangle$(EXEEXT) dvitype.web dvitype.ch
$(tangle) dvitype dvitype
nodist_gftodvi_SOURCES = gftodvi.c gftodvi.h
gftodvi.c gftodvi.h: gftodvi-web2c
-gftodvi-web2c: $(web2c_depend) gftodvi.p
- $(web2c) gftodvi
- echo timestamp >$@
- touch gftodvi.c gftodvi.h
+ @$(web2c) gftodvi
+gftodvi-web2c: gftodvi.p $(web2c_depend)
+ @$(web2c) gftodvi
gftodvi.p: tangle$(EXEEXT) gftodvi.web gftodvi.ch
$(tangle) gftodvi gftodvi
gftodvi_SOURCES = gftodmem.h
nodist_gftopk_SOURCES = gftopk.c gftopk.h
gftopk.c gftopk.h: gftopk-web2c
-gftopk-web2c: $(web2c_depend) gftopk.p
- $(web2c) gftopk
- echo timestamp >$@
- touch gftopk.c gftopk.h
+ @$(web2c) gftopk
+gftopk-web2c: gftopk.p $(web2c_depend)
+ @$(web2c) gftopk
gftopk.p: tangle$(EXEEXT) gftopk.web gftopk.ch
$(tangle) gftopk gftopk
nodist_gftype_SOURCES = gftype.c gftype.h
gftype.c gftype.h: gftype-web2c
-gftype-web2c: $(web2c_depend) gftype.p
- $(web2c) gftype
- echo timestamp >$@
- touch gftype.c gftype.h
+ @$(web2c) gftype
+gftype-web2c: gftype.p $(web2c_depend)
+ @$(web2c) gftype
gftype.p: tangle$(EXEEXT) gftype.web gftype.ch
$(tangle) gftype gftype
nodist_mft_SOURCES = mft.c mft.h
mft.c mft.h: mft-web2c
-mft-web2c: $(web2c_depend) mft.p
- $(web2c) mft
- echo timestamp >$@
- touch mft.c mft.h
+ @$(web2c) mft
+mft-web2c: mft.p $(web2c_depend)
+ @$(web2c) mft
mft.p: tangle$(EXEEXT) mft.web mft.ch
$(tangle) mft mft
nodist_patgen_SOURCES = patgen.c patgen.h
patgen.c patgen.h: patgen-web2c
-patgen-web2c: $(web2c_depend) patgen.p
- $(web2c) patgen
- echo timestamp >$@
- touch patgen.c patgen.h
+ @$(web2c) patgen
+patgen-web2c: patgen.p $(web2c_depend)
+ @$(web2c) patgen
patgen.p: tangle$(EXEEXT) patgen.web patgen.ch
$(tangle) patgen patgen
nodist_pktogf_SOURCES = pktogf.c pktogf.h
pktogf.c pktogf.h: pktogf-web2c
-pktogf-web2c: $(web2c_depend) pktogf.p
- $(web2c) pktogf
- echo timestamp >$@
- touch pktogf.c pktogf.h
+ @$(web2c) pktogf
+pktogf-web2c: pktogf.p $(web2c_depend)
+ @$(web2c) pktogf
pktogf.p: tangle$(EXEEXT) pktogf.web pktogf.ch
$(tangle) pktogf pktogf
nodist_pktype_SOURCES = pktype.c pktype.h
pktype.c pktype.h: pktype-web2c
-pktype-web2c: $(web2c_depend) pktype.p
- $(web2c) pktype
- echo timestamp >$@
- touch pktype.c pktype.h
+ @$(web2c) pktype
+pktype-web2c: pktype.p $(web2c_depend)
+ @$(web2c) pktype
pktype.p: tangle$(EXEEXT) pktype.web pktype.ch
$(tangle) pktype pktype
nodist_pltotf_SOURCES = pltotf.c pltotf.h
pltotf.c pltotf.h: pltotf-web2c
-pltotf-web2c: $(web2c_depend) pltotf.p
- $(web2c) pltotf
- echo timestamp >$@
- touch pltotf.c pltotf.h
+ @$(web2c) pltotf
+pltotf-web2c: pltotf.p $(web2c_depend)
+ @$(web2c) pltotf
pltotf.p: tangle$(EXEEXT) pltotf.web pltotf.ch
$(tangle) pltotf pltotf
nodist_pooltype_SOURCES = pooltype.c pooltype.h
pooltype.c pooltype.h: pooltype-web2c
-pooltype-web2c: $(web2c_depend) pooltype.p
- $(web2c) pooltype
- echo timestamp >$@
- touch pooltype.c pooltype.h
+ @$(web2c) pooltype
+pooltype-web2c: pooltype.p $(web2c_depend)
+ @$(web2c) pooltype
pooltype.p: tangle$(EXEEXT) pooltype.web pooltype.ch
$(tangle) pooltype pooltype
nodist_tftopl_SOURCES = tftopl.c tftopl.h
tftopl.c tftopl.h: tftopl-web2c
-tftopl-web2c: $(web2c_depend) tftopl.p
- $(web2c) tftopl
- echo timestamp >$@
- touch tftopl.c tftopl.h
+ @$(web2c) tftopl
+tftopl-web2c: tftopl.p $(web2c_depend)
+ @$(web2c) tftopl
tftopl.p: tangle$(EXEEXT) tftopl.web tftopl.ch
$(tangle) tftopl tftopl
nodist_vftovp_SOURCES = vftovp.c vftovp.h
vftovp.c vftovp.h: vftovp-web2c
-vftovp-web2c: $(web2c_depend) vftovp.p
- $(web2c) vftovp
- echo timestamp >$@
- touch vftovp.c vftovp.h
+ @$(web2c) vftovp
+vftovp-web2c: vftovp.p $(web2c_depend)
+ @$(web2c) vftovp
vftovp.p: tangle$(EXEEXT) vftovp.web vftovp.ch
$(tangle) vftovp vftovp
nodist_vptovf_SOURCES = vptovf.c vptovf.h
vptovf.c vptovf.h: vptovf-web2c
-vptovf-web2c: $(web2c_depend) vptovf.p
- $(web2c) vptovf
- echo timestamp >$@
- touch vptovf.c vptovf.h
+ @$(web2c) vptovf
+vptovf-web2c: vptovf.p $(web2c_depend)
+ @$(web2c) vptovf
vptovf.p: tangle$(EXEEXT) vptovf.web vptovf.ch
$(tangle) vptovf vptovf
nodist_weave_SOURCES = weave.c weave.h
weave.c weave.h: weave-web2c
-weave-web2c: $(web2c_depend) weave.p
- $(web2c) weave
- echo timestamp >$@
- touch weave.c weave.h
+ @$(web2c) weave
+weave-web2c: weave.p $(web2c_depend)
+ @$(web2c) weave
weave.p: tangle$(EXEEXT) weave.web weave.ch
$(tangle) weave weave
-
## Tests
##
web_tests = $(web_programs:=.test)
@@ -207,8 +190,6 @@ DISTCLEANFILES += pooltype.tex
## Test data
##
EXTRA_DIST += \
- tests/Cherokee.pl \
- tests/OCherokee.ovp \
tests/allbib.aux \
tests/allbib.tex \
tests/apalike.bst \
@@ -234,7 +215,6 @@ EXTRA_DIST += \
tests/just.texi \
tests/label.mp \
tests/label.mpx \
- tests/level1.opl \
tests/logo8.tfm \
tests/longtfm.tex \
tests/magic.tex \
@@ -261,7 +241,6 @@ EXTRA_DIST += \
tests/ptmr.vpl \
tests/rpsyr.tfm \
tests/rptmr.tfm \
- tests/specialhex.ovp \
tests/story.dvi \
tests/testex.err \
tests/testex.mp \