diff options
author | Karl Berry <karl@freefriends.org> | 2022-01-11 22:47:10 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-01-11 22:47:10 +0000 |
commit | 4902f0bb638a2a0b2c74cb856c0d0985561f38c8 (patch) | |
tree | a3005d1694f9e8d004e3a5c55abf32cbd7234780 /Build/source/texk/web2c/am | |
parent | a348646a50088b57d1f9d21d7270d8fa3344b769 (diff) |
make tangle-sh, ctangleboot-sh, and make report what they do
git-svn-id: svn://tug.org/texlive/trunk@61575 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/am')
-rw-r--r-- | Build/source/texk/web2c/am/bootstrap.am | 39 | ||||
-rw-r--r-- | Build/source/texk/web2c/am/texmf.am | 11 | ||||
-rw-r--r-- | Build/source/texk/web2c/am/web.am | 2 |
3 files changed, 27 insertions, 25 deletions
diff --git a/Build/source/texk/web2c/am/bootstrap.am b/Build/source/texk/web2c/am/bootstrap.am index 63717703ae3..e46ab3aa04e 100644 --- a/Build/source/texk/web2c/am/bootstrap.am +++ b/Build/source/texk/web2c/am/bootstrap.am @@ -1,6 +1,8 @@ +## $Id$ ## texk/web2c/am/bootstrap.am: Makefile fragment for tangle and ctangle. ## -## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> +## Copyright 2015-2022 Karl Berry <tex-live@tug.org> +## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. cp_silent = $(cp_silent_@AM_V@) @@ -13,30 +15,23 @@ cp_silent_1 = bin_PROGRAMS += tangle nodist_tangle_SOURCES = tangle.c tangle.h tangle.c tangle.h: tangle-web2c - @$(web2c) tangle + $(web2c) tangle tangle-web2c: tangle.p $(web2c_depend) - @$(web2c) tangle + $(web2c) tangle # tangle.p is a special case, since it is needed to compile itself. We # 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 $(tangleboot) tangle tangle - @cmp -s tangle.p $(srcdir)/tangleboot.pin || { \ + cmp -s tangle.p $(srcdir)/tangleboot.pin || { \ if $(AM_V_P); then \ echo "Updating tangle.p => $(srcdir)/tangleboot.pin"; \ else \ echo " UPD " tangleboot.pin; \ fi; 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 - @echo "You need both." >&2 - @echo >&2 - @echo "web.tar.gz should be available from the" >&2 - @echo "same place that you got web2c.tar.gz." >&2 - @echo "In any case, you can get it from" >&2 - @echo "ftp://ftp.tug.org/tex/web.tar.gz." >&2 + @echo "You seem to be missing tangle.web, goodbye." >&2 false EXTRA_DIST += tangle.web tangle.ch DISTCLEANFILES += tangle.c tangle.h tangle.p tangle-web2c @@ -44,9 +39,9 @@ DISTCLEANFILES += tangle.c tangle.h tangle.p tangle-web2c noinst_PROGRAMS += tangleboot nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h tangleboot.c tangleboot.h: tangleboot-web2c - @$(web2c) tangleboot + $(web2c) tangleboot tangleboot-web2c: tangleboot.p $(web2c_depend) - @$(web2c) tangleboot + $(web2c) tangleboot # tangleboot.pin is in the distribution .pin.p: $(cp_silent)cp -f $< $@ @@ -59,14 +54,19 @@ DISTCLEANFILES += tangleboot.c tangleboot.h tangleboot.p tangleboot-web2c # to create an up-to-date ctangleboot.cin and cwebboot.cin as well. bin_PROGRAMS += ctangle nodist_ctangle_SOURCES = ctangle.c cweb.c +# # ctangle.c and cweb.c are special cases, since they are needed to compile # themselves. We depend on ctangleboot, even though we might not use it. ctangleboot = AM_V_P=$(AM_V_P) $(SHELL) ./ctangleboot-sh $@ -ctangle.c: common-ctangle cwebdir/ctangle.w cwebdir/ctang-w2c.ch - @$(ctangleboot) ctangle ctang-w2c -cweb.c: common-ctangle cwebdir/common.w cwebdir/comm-w2c.ch - @$(ctangleboot) common comm-w2c cweb.c -common-ctangle: ctangleboot$(EXEEXT) cwebdir/comm-w2c.h ctangleboot-sh +# +ctangle.c: $(common_ctangle) cwebdir/ctangle.w cwebdir/ctang-w2c.ch + $(ctangleboot) ctangle ctang-w2c.ch +# +cweb.c: $(common_ctangle) cwebdir/common.w cwebdir/comm-w2c.ch + $(ctangleboot) common comm-w2c.ch cweb.c +# +common_ctangle = ctangleboot$(EXEEXT) cwebdir/comm-w2c.h ctangleboot-sh + EXTRA_DIST += cwebdir NEVER_DIST += cwebdir/cweave.log cwebdir/cweave.trs NEVER_DIST += cwebdir/ctwill.log cwebdir/ctwill.trs @@ -97,3 +97,4 @@ tangle.log: tangle$(EXEEXT) DISTCLEANFILES += cftest.p +# (end of bootstrap.am) diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am index 33b99ecdef6..c4a635fc4ed 100644 --- a/Build/source/texk/web2c/am/texmf.am +++ b/Build/source/texk/web2c/am/texmf.am @@ -1,7 +1,7 @@ ## $Id$ ## texk/web2c/am/texmf.am: Makefile fragment for TeX and MF. ## -## Copyright 2015-2021 Karl Berry <tex-live@tug.org> +## Copyright 2015-2022 Karl Berry <tex-live@tug.org> ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. @@ -54,9 +54,9 @@ tex-pool.c: tex.pool texd.h $(makecpool_stamp) # Tangling TeX tex.p tex.pool: tex-tangle - @$(texmf_tangle) tex tex-final + $(texmf_tangle) tex tex-final tex-tangle: tangle$(EXEEXT) tex.web tex-final.ch tangle-sh - @$(texmf_tangle) tex tex-final + $(texmf_tangle) tex tex-final # Generate tex-final.ch tex-final.ch: tie$(EXEEXT) $(tex_ch_srcs) @@ -186,9 +186,9 @@ mf-pool.c: mf.pool mfd.h $(makecpool_stamp) # Tangling Metafont mf.p mf.pool: mf-tangle - @$(texmf_tangle) mf mf-final + $(texmf_tangle) mf mf-final mf-tangle: tangle$(EXEEXT) mf.web mf-final.ch tangle-sh - @$(texmf_tangle) mf mf-final + $(texmf_tangle) mf mf-final # Generate mf-final.ch mf-final.ch: tie$(EXEEXT) $(mf_ch_src) @@ -273,3 +273,4 @@ EXTRA_DIST += \ triptrap/writeo \ triptrap/writeo.2 +# (end of texmf.am) diff --git a/Build/source/texk/web2c/am/web.am b/Build/source/texk/web2c/am/web.am index c7d700373c6..55048d62358 100644 --- a/Build/source/texk/web2c/am/web.am +++ b/Build/source/texk/web2c/am/web.am @@ -2,7 +2,7 @@ ## texk/web2c/am/web.am: Makefile fragment for the standard web programs -- ## except tangle. ## -## Copyright 2018-2019 Karl Berry <tex-live@tug.org> +## Copyright 2018-2022 Karl Berry <tex-live@tug.org> ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. |