From patchwork Tue Sep 17 02:57:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 34547 Received: (qmail 110000 invoked by alias); 17 Sep 2019 02:57:38 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 109991 invoked by uid 89); 17 Sep 2019 02:57:37 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-17.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_SOFTFAIL autolearn=ham version=3.3.1 spammy=Maintenance, T, pod, Regenerate X-HELO: barracuda.ebox.ca Received: from barracuda.ebox.ca (HELO barracuda.ebox.ca) (96.127.255.19) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 17 Sep 2019 02:57:35 +0000 Received: from smtp.ebox.ca (smtp.ebox.ca [96.127.255.82]) by barracuda.ebox.ca with ESMTP id YTZFGkBZJFEAuPUf (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 16 Sep 2019 22:57:33 -0400 (EDT) Received: from simark.lan (unknown [192.222.164.54]) by smtp.ebox.ca (Postfix) with ESMTP id 4A644441B21; Mon, 16 Sep 2019 22:57:33 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 3/3] binutils: doc: make `make clean` clean more things Date: Mon, 16 Sep 2019 22:57:31 -0400 Message-Id: <20190917025731.300902-3-simon.marchi@polymtl.ca> In-Reply-To: <20190917025731.300902-1-simon.marchi@polymtl.ca> References: <20190917025731.300902-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-IsSubscribed: yes There is a bunch of things left over after a `make clean` in the doc directory. This patch changes the Makefile so that everything built by make is cleaned: - man pages (the man_MANS variable) - cxxfilt.man - binutils.info I am not sure why the last one was in MAINTAINERCLEANFILES. It's generated from binutils.texi using makeinfo, and it's not particularly long to build, so I don't see why it shouldn't be cleaned like the other files. Note: with my automake 1,15.1 (built from source), I get a spurious diff in Makefile.in, where the runstatedir = @runstatedir@ line gets removed. I am not sure why, but I haven't included it. binutils/ChangeLog: * doc/Makefile.am (MOSTLYCLEANFILES): Clean all man pages, cxxfilt.man and binutils.info. (MAINTAINERCLEANFILES): Remove. * doc/Makefile.in: Re-generate. --- binutils/doc/Makefile.am | 4 +--- binutils/doc/Makefile.in | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am index 9eabaa7a611d..803b1f8ca312 100644 --- a/binutils/doc/Makefile.am +++ b/binutils/doc/Makefile.am @@ -162,7 +162,7 @@ cxxfilt.man: $(binutils_TEXI) mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f $(DEMANGLER_NAME).pod -MOSTLYCLEANFILES = $(DEMANGLER_NAME).1 +MOSTLYCLEANFILES = $(man_MANS).1 binutils.info cxxfilt.man $(DEMANGLER_NAME).1: cxxfilt.man Makefile if test -f cxxfilt.man; then \ @@ -174,8 +174,6 @@ $(DEMANGLER_NAME).1: cxxfilt.man Makefile -e 's/cxxfilt/$(DEMANGLER_NAME)/' < $$man \ > $(DEMANGLER_NAME).1 -MAINTAINERCLEANFILES = binutils.info - # Maintenance # We need it for the taz target in ../../Makefile.in. diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in index 59e9f79c7cc7..8446a118b4fe 100644 --- a/binutils/doc/Makefile.in +++ b/binutils/doc/Makefile.in @@ -427,8 +427,7 @@ AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \ TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \ -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc -MOSTLYCLEANFILES = $(DEMANGLER_NAME).1 -MAINTAINERCLEANFILES = binutils.info +MOSTLYCLEANFILES = $(man_MANS).1 binutils.info cxxfilt.man all: all-am .SUFFIXES: @@ -722,7 +721,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am clean-am: clean-aminfo clean-generic clean-libtool mostlyclean-am