OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

binutils: doc: make `make clean` clean more things 

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.
This commit is contained in:
Simon Marchi 2019-09-18 09:14:59 -04:00 committed by Simon Marchi
parent 89ae5e6923
commit 2b44a6a237
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
binutils/ChangeLog
View File

@ -1,3 +1,10 @@
2019-09-18 Simon Marchi <simon.marchi@polymtl.ca>
* doc/Makefile.am (MOSTLYCLEANFILES): Clean all man pages,
cxxfilt.man and binutils.info.
(MAINTAINERCLEANFILES): Remove.
* doc/Makefile.in: Re-generate.
2019-09-18 Simon Marchi <simon.marchi@polymtl.ca>
* doc/Makefile.am: Remove references to binutils_TEXINFOS.

4
binutils/doc/Makefile.am
View File

@ -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) 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.

4
binutils/doc/Makefile.in
View File

@ -426,8 +426,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) binutils.info cxxfilt.man
all: all-am
.SUFFIXES:
@ -721,7 +720,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