From patchwork Fri Apr 12 17:00:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 88440 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8BFC83858403 for ; Fri, 12 Apr 2024 17:01:08 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 8F8823858D38 for ; Fri, 12 Apr 2024 17:00:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8F8823858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8F8823858D38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712941242; cv=none; b=k14ONDH2/QecmqjDLIV8Ie7HbMuuS4rnliblOKqYNtV2fe3Q+I6iEkx3V0dNc4xTBXdaP+vfq3RZtU+XgNnxS2wTIDBTKocBHj7eYKSd6nUfkh8i3raXhsBVwo1o1ehOLmmUIGGsOhRiECKSx60AwqpgcW91lcgitESNQNAhcEU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712941242; c=relaxed/simple; bh=zK32tZfcE+SGzAa0NG0oAToGTVxeTHNOsN3x6Rpdp2U=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=IbVglwIB/OHfQocuYg5pDw9dV0zXjb783Z4FkqO/hDUaTQhesB7HUmxT1F8ro5HK5G38EqFsvfa+ps86+HWX8X8fLqAT71xIeFN21M7wndEmjMqqxFc+wERTK22taHOerBFVN+zF7ShmAV5AjKaz1eEBtjJgDsjCsU00OsHjrRg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712941231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CIrf0Z/jp1kyPnqGRgYLHUBae1hJETUQxp4yk+rqsXg=; b=Ml+3syVAaOabbcYyKtOWVw9QNC1042KUNK/X2Yd1ekV12xdxpUpLIEIPksqtX1Okl83hOc I/sP0YPYRM5gEBhFDFLKjSUoN5Jwp4EiPM0ZFOfueJ6cdt0YIfDk3zZCfsfBlbC8Rmbv6M zOpET0r0SE7IDA7pg8Vdc+TL40jkw0o= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-90-vjkyBbwUNfqQrolebxLsgg-1; Fri, 12 Apr 2024 13:00:28 -0400 X-MC-Unique: vjkyBbwUNfqQrolebxLsgg-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-41663448bcbso10650115e9.1 for ; Fri, 12 Apr 2024 10:00:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712941227; x=1713546027; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CIrf0Z/jp1kyPnqGRgYLHUBae1hJETUQxp4yk+rqsXg=; b=b6oJHNV4xcwlJwIwBLn7OFjfrPbhoiwmaa+WiIRoGTxsaMigPwPoAHQA8U+eTGiedZ iUwmKKj2FbsGc873gTuhzynXFAkHQYI/44VTZk8bTPIzKQEeyPYyap3a1h1nUEw61msN FalfHshRQnqdF4cWVrCHDym98nwF4dNgSAJVV6lzQMFBO3blB+NDmztx9OHTQUwUxttg ZnXw/jaOsjrh2EIXMr+bav+2BS9a4aA9dlT116pASC6eldJU59Xz8mX/mpfzhf6MzgwS uL7JWn1oUnRhJz4nRcyFULtFSxvuXBfzIF6s0/66bzvIolS3wA8m+zUCOtvijUs2RShY gi3A== X-Gm-Message-State: AOJu0YxtdyM2IqhNEkLVlAyVv5UrbSpkmFDQSPJBCYvYiUQnKQd3oPUV bhrpkinPWtC8umi1VByTSO4C/4PXWuc1zKsxNx1KhcTAOhAcjvqsSu+xnxz39AH30+JOiF5odgN lkeNfivaM7IOjTLADMKOhNtZOnndmnPe8EeFnDn/LbN9wAwqo/0B5+NM9aj7eJuF95Uv5XLF6TL Dhb93ykTsn/0mKg0CyAyrcSJ10WqwYdjueAuwbAt582NM= X-Received: by 2002:a5d:630e:0:b0:343:bb49:2103 with SMTP id i14-20020a5d630e000000b00343bb492103mr5392875wru.9.1712941226396; Fri, 12 Apr 2024 10:00:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHjjBFM7LL9neJz68G1vcZFDfivjH0FMRGyKLEzS2SB41tXkWIL0OzhgAun/m0z+9WO6aX1vA== X-Received: by 2002:a5d:630e:0:b0:343:bb49:2103 with SMTP id i14-20020a5d630e000000b00343bb492103mr5392846wru.9.1712941225603; Fri, 12 Apr 2024 10:00:25 -0700 (PDT) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id l23-20020a05600c1d1700b004163ee3922csm9393581wms.38.2024.04.12.10.00.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 10:00:25 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH] gdb/doc: use silent-rules.mk in the Makefile Date: Fri, 12 Apr 2024 18:00:23 +0100 Message-Id: <09d4a16a33cf31f558a8982075800b113ed4a14e.1712940998.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, URIBL_BLACK autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Make use of silent-rules.mk when building the GDB docs. Most of these are pretty straight forward, adding ECHO_GEN and then lots of SILENCE prefixes. I added a new SILENT_QUIET_FLAG to silent-rules.mk, this is like SILENT_FLAG, but is set to '-q' when in silent mode, this can be used with the 'dvips' and 'texi2dvi' commands, both of which use '-q' to mean: only report errors. As with the rest of the GDB makefiles, I've only converted the "generation" rules to use silent-rules.mk, the install / uninstall rules are left unchanged. There are still a few "generation" targets that produce output, there seems to be no flag to silence the 'tex' and 'pdftex' commands which some recipes use, I've not worried about these for now, e.g. the refcard.dvi and refcard.pdf targets still produce some output. Luckily, when doing a 'make all' in the gdb/ directory, we only build the info docs by default, and those rules are now nice and silent, so a complete GDB build is now looking nice and quiet by default. --- gdb/doc/Makefile.in | 158 ++++++++++++++++++++++++-------------------- gdb/silent-rules.mk | 1 + 2 files changed, 86 insertions(+), 73 deletions(-) base-commit: 032e5e0c0c08977e8109e8482cd944bac8572d92 diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in index 8007f6373d4..b999e3ffd3b 100644 --- a/gdb/doc/Makefile.in +++ b/gdb/doc/Makefile.in @@ -33,6 +33,8 @@ man5dir = $(mandir)/man5 transform = @program_transform_name@ +include $(srcdir)/../silent-rules.mk + SHELL = @SHELL@ LN_S = @LN_S@ @@ -406,55 +408,58 @@ de-stage3: force # GDB QUICK REFERENCE (dvi output) refcard.dvi : refcard.tex $(REFEDITS) - echo > tmp.sed - for f in x $(REFEDITS) ; do \ + $(ECHO_GEN) + $(SILENCE) echo > tmp.sed + $(SILENCE) for f in x $(REFEDITS) ; do \ test x$$f = xx && continue ; \ cat $(srcdir)/$$f >>tmp.sed ; \ done - sed -f tmp.sed $(srcdir)/refcard.tex >sedref.tex - $(SET_TEXINPUTS) $(TEX) sedref.tex - mv sedref.dvi refcard.dvi - rm -f sedref.log sedref.tex tmp.sed + $(SILENCE) sed -f tmp.sed $(srcdir)/refcard.tex >sedref.tex + $(SILENCE) $(SET_TEXINPUTS) $(TEX) sedref.tex + $(SILENCE) mv sedref.dvi refcard.dvi + $(SILENCE) rm -f sedref.log sedref.tex tmp.sed refcard.ps : refcard.dvi - $(DVIPS) -t landscape -o $@ $? + $(ECHO_GEN) $(DVIPS) $(SILENT_QUIET_FLAG) -t landscape -o $@ $? refcard.pdf : refcard.tex $(REFEDITS) - echo > tmp.sed - for f in x $(REFEDITS) ; do \ + $(ECHO_GEN) + $(SILENCE) echo > tmp.sed + $(SILENCE) for f in x $(REFEDITS) ; do \ test x$$f = xx && continue ; \ cat $(srcdir)/$$f >>tmp.sed ; \ done - sed -f tmp.sed $(srcdir)/refcard.tex >sedref.tex - $(SET_TEXINPUTS) $(PDFTEX) sedref.tex - mv sedref.pdf refcard.pdf - rm -f sedref.log sedref.tex tmp.sed + $(SILENCE) sed -f tmp.sed $(srcdir)/refcard.tex >sedref.tex + $(SILENCE) $(SET_TEXINPUTS) $(PDFTEX) sedref.tex + $(SILENCE) mv sedref.pdf refcard.pdf + $(SILENCE) rm -f sedref.log sedref.tex tmp.sed # File to record current GDB version number. GDBvn.texi : version.subst - echo "@set GDBVN `sed q version.subst`" > ./GDBvn.new - if [ -n "$(PKGVERSION)" ]; then \ + $(ECHO_GEN) + $(SILENCE) echo "@set GDBVN `sed q version.subst`" > ./GDBvn.new + $(SILENCE) if [ -n "$(PKGVERSION)" ]; then \ echo "@set VERSION_PACKAGE $(PKGVERSION)" >> ./GDBvn.new; \ fi - echo "@set BUGURL $(BUGURL_TEXI)" >> ./GDBvn.new - if [ "$(BUGURL_TEXI)" = "@uref{http://www.gnu.org/software/gdb/bugs/}" ]; then \ + $(SILENCE) echo "@set BUGURL $(BUGURL_TEXI)" >> ./GDBvn.new + $(SILENCE) if [ "$(BUGURL_TEXI)" = "@uref{http://www.gnu.org/software/gdb/bugs/}" ]; then \ echo "@set BUGURL_DEFAULT" >> ./GDBvn.new; \ fi - if test -z "$(READLINE_TEXI_INCFLAG)"; then \ + $(SILENCE) if test -z "$(READLINE_TEXI_INCFLAG)"; then \ echo "@set SYSTEM_READLINE" >> ./GDBvn.new; \ fi - if [ -n "$(SYSTEM_GDBINIT)" ]; then \ + $(SILENCE) if [ -n "$(SYSTEM_GDBINIT)" ]; then \ escaped_system_gdbinit=`echo $(SYSTEM_GDBINIT) | sed 's/@/@@/g'`; \ echo "@set SYSTEM_GDBINIT $$escaped_system_gdbinit" >> ./GDBvn.new; \ fi - if [ -n "$(SYSTEM_GDBINIT_DIR)" ]; then \ + $(SILENCE) if [ -n "$(SYSTEM_GDBINIT_DIR)" ]; then \ escaped_system_gdbinit_dir=`echo $(SYSTEM_GDBINIT_DIR) | sed 's/@/@@/g'`; \ echo "@set SYSTEM_GDBINIT_DIR $$escaped_system_gdbinit_dir" >> ./GDBvn.new; \ fi - mv GDBvn.new GDBvn.texi + $(SILENCE) mv GDBvn.new GDBvn.texi version.subst: $(gdbdir)/version.in $(gdbdir)/../bfd/version.h - date=`sed -n -e 's/^.* BFD_VERSION_DATE \(.*\)$$/\1/p' $(gdbdir)/../bfd/version.h`; \ + $(ECHO_GEN) date=`sed -n -e 's/^.* BFD_VERSION_DATE \(.*\)$$/\1/p' $(gdbdir)/../bfd/version.h`; \ sed -e "s/DATE/$$date/" < $(gdbdir)/version.in > version.subst # Updated atomically @@ -465,7 +470,7 @@ version.subst: $(gdbdir)/version.in $(gdbdir)/../bfd/version.h # not one for their binary config---which may not be specifically # defined anyways). gdb-cfg.texi: ${srcdir}/${DOC_CONFIG}-cfg.texi - (test "$(LN_S)" = "ln -s" && \ + $(ECHO_GEN) (test "$(LN_S)" = "ln -s" && \ ln -s ${srcdir}/${DOC_CONFIG}-cfg.texi gdb-cfg.texi) || \ ln ${srcdir}/${DOC_CONFIG}-cfg.texi gdb-cfg.texi || \ cp ${srcdir}/${DOC_CONFIG}-cfg.texi gdb-cfg.texi @@ -487,29 +492,32 @@ GDB_TEX_TMPS = gdb.aux gdb.cp* gdb.fn* gdb.ky* gdb.log gdb.pg* gdb.toc \ # GDB MANUAL: TeX dvi file gdb.dvi: ${GDB_DOC_FILES} - if [ ! -f ./GDBvn.texi ]; then \ + $(ECHO_GEN) + $(SILENCE) if [ ! -f ./GDBvn.texi ]; then \ (test "$(LN_S)" = "ln -s" && ln -s $(srcdir)/GDBvn.texi .) || \ ln $(srcdir)/GDBvn.texi . || \ cp $(srcdir)/GDBvn.texi . ; else true; fi - rm -f $(GDB_TEX_TMPS) - $(TEXI2DVI) $(READLINE_TEXI_INCFLAG) -I ${GDBMI_DIR} -I $(srcdir) \ - $(srcdir)/gdb.texinfo + $(SILENCE) rm -f $(GDB_TEX_TMPS) + $(SILENCE) $(TEXI2DVI) $(SILENT_QUIET_FLAG) $(READLINE_TEXI_INCFLAG) \ + -I ${GDBMI_DIR} -I $(srcdir) $(srcdir)/gdb.texinfo gdb.ps: gdb.dvi - $(DVIPS) -o $@ $? + $(ECHO_GEN) $(DVIPS) $(SILENT_QUIET_FLAG) -o $@ $? gdb.pdf: ${GDB_DOC_FILES} - if [ ! -f ./GDBvn.texi ]; then \ + $(ECHO_GEN) + $(SILENCE) if [ ! -f ./GDBvn.texi ]; then \ (test "$(LN_S)" = "ln -s" && ln -s $(srcdir)/GDBvn.texi .) || \ ln $(srcdir)/GDBvn.texi . || \ cp $(srcdir)/GDBvn.texi . ; else true; fi - rm -f $(GDB_TEX_TMPS) - $(TEXI2DVI) --pdf $(READLINE_TEXI_INCFLAG) -I ${GDBMI_DIR} -I $(srcdir) \ + $(SILENCE) rm -f $(GDB_TEX_TMPS) + $(SILENCE) $(TEXI2DVI) $(SILENT_QUIET_FLAG) --pdf \ + $(READLINE_TEXI_INCFLAG) -I ${GDBMI_DIR} -I $(srcdir) \ $(srcdir)/gdb.texinfo # GDB MANUAL: info file gdb.info: ${GDB_DOC_FILES} - $(MAKEINFO_CMD) $(READLINE_TEXI_INCFLAG) -I ${GDBMI_DIR} -I $(srcdir) \ + $(ECHO_GEN) $(MAKEINFO_CMD) $(READLINE_TEXI_INCFLAG) -I ${GDBMI_DIR} -I $(srcdir) \ -o gdb.info $(srcdir)/gdb.texinfo # GDB MANUAL: roff translations @@ -527,16 +535,16 @@ gdb.info: ${GDB_DOC_FILES} # it out for gdb manual's include files---but only if not configured # in main sourcedir. links2roff: $(GDB_DOC_SOURCE_INCLUDES) - if [ ! -f gdb.texinfo ]; then \ + $(ECHO_GEN) if [ ! -f gdb.texinfo ]; then \ (test "$(LN_S)" = "ln -s" && ln -s $(GDB_DOC_SOURCE_INCLUDES) .) || \ ln $(GDB_DOC_SOURCE_INCLUDES) . || \ cp $(GDB_DOC_SOURCE_INCLUDES) . ; \ fi - touch links2roff + $(SILENCE) touch links2roff # gdb manual suitable for [gtn]roff -me gdb.me: $(GDB_DOC_FILES) links2roff - sed -e '/\\input texinfo/d' \ + $(ECHO_GEN) sed -e '/\\input texinfo/d' \ -e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \ -e '/^@ifinfo/,/^@end ifinfo/d' \ -e '/^@c /d' \ @@ -551,7 +559,7 @@ gdb.me: $(GDB_DOC_FILES) links2roff # gdb manual suitable for [gtn]roff -ms gdb.ms: $(GDB_DOC_FILES) links2roff - sed -e '/\\input texinfo/d' \ + $(ECHO_GEN) sed -e '/\\input texinfo/d' \ -e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \ -e '/^@ifinfo/,/^@end ifinfo/d' \ -e '/^@c /d' \ @@ -568,7 +576,7 @@ gdb.ms: $(GDB_DOC_FILES) links2roff # '@noindent's removed due to texi2roff-2 mm bug; if yours is newer, # try leaving them in gdb.mm: $(GDB_DOC_FILES) links2roff - sed -e '/\\input texinfo/d' \ + $(ECHO_GEN) sed -e '/\\input texinfo/d' \ -e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \ -e '/^@ifinfo/,/^@end ifinfo/d' \ -e '/^@c /d' \ @@ -585,18 +593,18 @@ gdb.mm: $(GDB_DOC_FILES) links2roff # GDB MANUAL: HTML file gdb/index.html: ${GDB_DOC_FILES} - $(MAKEHTML) $(MAKEHTMLFLAGS) \ + $(ECHO_GEN) $(MAKEHTML) $(MAKEHTMLFLAGS) \ -o gdb \ $(READLINE_TEXI_INCFLAG) -I ${GDBMI_DIR} -I $(srcdir) \ $(srcdir)/gdb.texinfo stabs.info: $(STABS_DOC_FILES) - $(MAKEINFO_CMD) -I $(srcdir) -o stabs.info $(srcdir)/stabs.texinfo + $(ECHO_GEN) $(MAKEINFO_CMD) -I $(srcdir) -o stabs.info $(srcdir)/stabs.texinfo # STABS DOCUMENTATION: HTML file stabs/index.html: $(STABS_DOC_FILES) - $(MAKEHTML) $(MAKEHTMLFLAGS) \ + $(ECHO_GEN) $(MAKEHTML) $(MAKEHTMLFLAGS) \ -o stabs \ -I $(srcdir) \ $(srcdir)/stabs.texinfo @@ -609,15 +617,17 @@ STABS_TEX_TMPS = stabs.aux stabs.cp* stabs.fn* stabs.ky* \ # STABS DOCUMENTATION: TeX dvi file stabs.dvi : $(STABS_DOC_FILES) - rm -f $(STABS_TEX_TMPS) - $(TEXI2DVI) -I $(srcdir) $(srcdir)/stabs.texinfo + $(ECHO_GEN) rm -f $(STABS_TEX_TMPS) + $(SILENCE) $(TEXI2DVI) $(SILENT_QUIET_FLAG) -I $(srcdir) \ + $(srcdir)/stabs.texinfo stabs.ps: stabs.dvi - $(DVIPS) -o $@ $? + $(ECHO_GEN) $(DVIPS) $(SILENT_QUIET_FLAG) -o $@ $? stabs.pdf: $(STABS_DOC_FILES) - rm -f $(STABS_TEX_TMPS) - $(TEXI2DVI) --pdf -I $(srcdir) $(srcdir)/stabs.texinfo + $(ECHO_GEN) rm -f $(STABS_TEX_TMPS) + $(SILENCE) $(TEXI2DVI) $(SILENT_QUIET_FLAG) --pdf -I $(srcdir) \ + $(srcdir)/stabs.texinfo # Clean these up before each run. Avoids a catch 22 with not being # able to re-generate these files (to fix a corruption) because these @@ -627,65 +637,67 @@ ANNOTATE_TEX_TMPS = annotate.aux annotate.cp* annotate.fn* annotate.ky* \ # ANNOTATE DOCUMENTATION: TeX dvi file annotate.dvi : $(ANNOTATE_DOC_FILES) - rm -f $(ANNOTATE_TEX_TMPS) - $(TEXI2DVI) -I $(srcdir) $(srcdir)/annotate.texinfo + $(SILENCE) rm -f $(ANNOTATE_TEX_TMPS) + $(ECHO_GEN) $(TEXI2DVI) $(SILENT_QUIET_FLAG) -I $(srcdir) \ + $(srcdir)/annotate.texinfo annotate.ps: annotate.dvi - $(DVIPS) -o $@ $? + $(ECHO_GEN) $(DVIPS) $(SILENT_QUIET_FLAG) -o $@ $? annotate.pdf: $(ANNOTATE_DOC_FILES) - rm -f $(ANNOTATE_TEX_TMPS) - $(TEXI2DVI) --pdf -I $(srcdir) $(srcdir)/annotate.texinfo + $(SILENCE) rm -f $(ANNOTATE_TEX_TMPS) + $(ECHO_GEN) $(TEXI2DVI) $(SILENT_QUIET_FLAG) --pdf -I $(srcdir) \ + $(srcdir)/annotate.texinfo annotate.info: $(ANNOTATE_DOC_FILES) - $(MAKEINFO_CMD) -I $(srcdir) -o annotate.info $(srcdir)/annotate.texinfo + $(ECHO_GEN) $(MAKEINFO_CMD) -I $(srcdir) -o annotate.info $(srcdir)/annotate.texinfo annotate/index.html: $(ANNOTATE_DOC_FILES) - $(MAKEHTML) $(MAKEHTMLFLAGS) \ + $(ECHO_GEN) $(MAKEHTML) $(MAKEHTMLFLAGS) \ -o annotate \ -I $(srcdir) \ $(srcdir)/annotate.texinfo # Man pages gdb.1: $(GDB_DOC_FILES) - touch $@ - -$(TEXI2POD) $(MANCONF) -Dgdb < $(srcdir)/gdb.texinfo > gdb.pod - -($(POD2MAN1) gdb.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ + $(ECHO_GEN) touch $@ + $(SILENCE) -$(TEXI2POD) $(MANCONF) -Dgdb < $(srcdir)/gdb.texinfo > gdb.pod + $(SILENCE) -($(POD2MAN1) gdb.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) - rm -f gdb.pod + $(SILENCE) rm -f gdb.pod gdbserver.1: $(GDB_DOC_FILES) - touch $@ - -$(TEXI2POD) $(MANCONF) -Dgdbserver < $(srcdir)/gdb.texinfo > gdbserver.pod - -($(POD2MAN1) gdbserver.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ + $(ECHO_GEN) touch $@ + $(SILENCE) -$(TEXI2POD) $(MANCONF) -Dgdbserver < $(srcdir)/gdb.texinfo > gdbserver.pod + $(SILENCE) -($(POD2MAN1) gdbserver.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) - rm -f gdbserver.pod + $(SILENCE) rm -f gdbserver.pod gcore.1: $(GDB_DOC_FILES) - touch $@ - -$(TEXI2POD) $(MANCONF) -Dgcore < $(srcdir)/gdb.texinfo > gcore.pod - -($(POD2MAN1) gcore.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ + $(ECHO_GEN) touch $@ + $(SILENCE) -$(TEXI2POD) $(MANCONF) -Dgcore < $(srcdir)/gdb.texinfo > gcore.pod + $(SILENCE) -($(POD2MAN1) gcore.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) - rm -f gcore.pod + $(SILENCE) rm -f gcore.pod gdb-add-index.1: $(GDB_DOC_FILES) - touch $@ - -$(TEXI2POD) $(MANCONF) -Dgdb-add-index < $(srcdir)/gdb.texinfo > gdb-add-index.pod - -($(POD2MAN1) gdb-add-index.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ + $(ECHO_GEN) touch $@ + $(SILENCE) -$(TEXI2POD) $(MANCONF) -Dgdb-add-index < $(srcdir)/gdb.texinfo > gdb-add-index.pod + $(SILENCE) -($(POD2MAN1) gdb-add-index.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) - rm -f gdb-add-index.pod + $(SILENCE) rm -f gdb-add-index.pod gdbinit.5: $(GDB_DOC_FILES) - touch $@ - -$(TEXI2POD) $(MANCONF) -Dgdbinit < $(srcdir)/gdb.texinfo > gdbinit.pod - -($(POD2MAN5) gdbinit.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ + $(ECHO_GEN) touch $@ + $(SILENCE) -$(TEXI2POD) $(MANCONF) -Dgdbinit < $(srcdir)/gdb.texinfo > gdbinit.pod + $(SILENCE) -($(POD2MAN5) gdbinit.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) - rm -f gdbinit.pod + $(SILENCE) rm -f gdbinit.pod force: Makefile: Makefile.in $(host_makefile_frag) ../config.status - cd .. && $(SHELL) ./config.status doc/Makefile + $(ECHO_GEN) cd .. && $(SHELL) ./config.status $(SILENT_FLAG) doc/Makefile # The "least clean" level of cleaning. Get rid of files which are diff --git a/gdb/silent-rules.mk b/gdb/silent-rules.mk index 43dc2bf3aca..324dae52954 100644 --- a/gdb/silent-rules.mk +++ b/gdb/silent-rules.mk @@ -20,6 +20,7 @@ ECHO_RANLIB = @echo " RANLIB $@"; SILENCE = @ # Silence libtool. SILENT_FLAG = --silent +SILENT_QUIET_FLAG = -q # Used in shell snippets instead of 'echo'. SILENT_ECHO = true else