diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2019-09-18 09:14:59 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@efficios.com> | 2019-09-18 09:14:59 -0400 |
| commit | 2b44a6a237320a390284b1a8237a6bed67d5401f (patch) | |
| tree | 690e26576f0515ad08b9e4c528551ad20f37cedc /binutils | |
| parent | 89ae5e692398f008d06a8e38d1b531131f41a683 (diff) | |
| download | gdb-2b44a6a237320a390284b1a8237a6bed67d5401f.zip gdb-2b44a6a237320a390284b1a8237a6bed67d5401f.tar.gz gdb-2b44a6a237320a390284b1a8237a6bed67d5401f.tar.bz2 | |
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.
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 7 | ||||
| -rw-r--r-- | binutils/doc/Makefile.am | 4 | ||||
| -rw-r--r-- | binutils/doc/Makefile.in | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 5c424d6..c26d278 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,12 @@ 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. * doc/Makefile.in: Re-generate. diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am index 9eabaa7..c58fa68 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) 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 73600fb..3023c7b 100644 --- a/binutils/doc/Makefile.in +++ b/binutils/doc/Makefile.in @@ -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 |