diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-12-29 14:32:45 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-12-29 14:32:45 +0000 |
commit | 9da2af345bbc3848d181319a77b830c77034ae1e (patch) | |
tree | 74832eb1c57486b7ce18e0d987150cbdf42876a9 /Build/source/texk/web2c/am | |
parent | a7c9a7ff1a6d0925eafe21175304c494e266b319 (diff) |
build system: Enable "silent rules" (see Automake manual)
git-svn-id: svn://tug.org/texlive/trunk@28654 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/am')
-rw-r--r-- | Build/source/texk/web2c/am/bootstrap.am | 30 | ||||
-rw-r--r-- | Build/source/texk/web2c/am/cweb.am | 8 |
2 files changed, 23 insertions, 15 deletions
diff --git a/Build/source/texk/web2c/am/bootstrap.am b/Build/source/texk/web2c/am/bootstrap.am index c9cc6db4b8e..e6cbd3f3b3c 100644 --- a/Build/source/texk/web2c/am/bootstrap.am +++ b/Build/source/texk/web2c/am/bootstrap.am @@ -1,8 +1,13 @@ ## texk/web2c/am/bootstrap.am: Makefile fragment for tangle and ctangle. ## -## Copyright (C) 2009 - 2010 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. +cp_silent = $(cp_silent_@AM_V@) +cp_silent_ = $(cp_silent_@AM_DEFAULT_V@) +cp_silent_0 = @echo " COPY " $@; +cp_silent_1 = + # Bootstrapping tangle requires making it with itself. We use the opportunity # to create an up-to-date tangleboot.pin as well. bin_PROGRAMS += tangle @@ -16,8 +21,13 @@ tangle-web2c: tangle.p $(web2c_depend) # 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 + $(tangleboot) tangle tangle + @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 @@ -39,7 +49,7 @@ tangleboot-web2c: tangleboot.p $(web2c_depend) @$(web2c) tangleboot # tangleboot.pin is in the distribution .pin.p: - cp -f $< $@ + $(cp_silent)cp -f $< $@ $(tangleboot_OBJECTS): $(tangleboot_DEPENDENCIES) tangleboot_DEPENDENCIES = $(default_dependencies) EXTRA_DIST += tangleboot.pin @@ -52,10 +62,8 @@ nodist_ctangle_SOURCES = ctangle.c cweb.c $(ctangle_OBJECTS): cweb.h # 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 = AM_V_P=$(AM_V_P) $(SHELL) ./ctangleboot-sh $@ +ctangle.c: 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 @@ -64,16 +72,16 @@ common-ctangle: ctangleboot$(EXEEXT) cwebdir/common.w cwebdir/comm-w2c.ch ctangl EXTRA_DIST += cwebdir ## We install man/cweb.man, not cwebdir/cweb.1 ## nodist_man_MANS += cwebdir/cweb.1 -DISTCLEANFILES += ctangle.c cweb.c cweb.h ctangle-ctangle common-ctangle +DISTCLEANFILES += ctangle.c cweb.c cweb.h common-ctangle noinst_PROGRAMS += ctangleboot nodist_ctangleboot_SOURCES = ctangleboot.c cwebboot.c $(ctangleboot_OBJECTS): cwebboot.h $(ctangleboot_DEPENDENCIES) # ctangleboot.cin and cwebboot.[ch]in are in the distribution .cin.c: - cp -f $< $@ + $(cp_silent)cp -f $< $@ .hin.h: - cp -f $< $@ + $(cp_silent)cp -f $< $@ ctangleboot_DEPENDENCIES = $(default_dependencies) EXTRA_DIST += ctangleboot.cin cwebboot.cin cwebboot.hin DISTCLEANFILES += ctangleboot.c cwebboot.c cwebboot.h diff --git a/Build/source/texk/web2c/am/cweb.am b/Build/source/texk/web2c/am/cweb.am index 0f8534bd8c2..21ff78f8301 100644 --- a/Build/source/texk/web2c/am/cweb.am +++ b/Build/source/texk/web2c/am/cweb.am @@ -1,6 +1,6 @@ ## texk/web2c/am/cweb.am: Makefile fragment for cweb programs (except ctangle). ## -## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. bin_PROGRAMS += ctie cweave tie @@ -10,13 +10,13 @@ nodist_ctie_SOURCES = ctie.c ## We install man/ctie.man, not ctiedir/ctie.1 ## 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 + $(ctangle_silent)CWEBINPUTS=$(srcdir)/ctiedir $(ctangle) ctie.w ctie-k.ch DISTCLEANFILES += ctie.c nodist_cweave_SOURCES = cweave.c cweb.c $(cweave_OBJECTS): cweb.h cweave.c: ctangle$(EXEEXT) cwebdir/common.h cwebdir/cweave.w cwebdir/prod.w cwebdir/cweav-w2c.ch - CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) cweave cweav-w2c + $(ctangle_silent)CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) cweave cweav-w2c DISTCLEANFILES += cweave.c nodist_tie_SOURCES = tie.c @@ -24,7 +24,7 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C ## We install man/tie.man, not tiedir/tie.1 ## 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 + $(ctangle_silent)CWEBINPUTS=$(srcdir)/tiedir $(ctangle) tie.w tie-w2c.ch DISTCLEANFILES += tie.c ## Tests |