diff options
| author | Simon Marchi <simon.marchi@efficios.com> | 2020-03-06 22:06:34 -0500 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2020-03-06 22:06:34 -0500 |
| commit | 9979ab666354f355da46ba826a3efeef9fbb8b24 (patch) | |
| tree | 5fdb9c993a27b7dc03cb5f6167d99316af3b8293 | |
| parent | 12e4371ae41c3e162e3051a0f6507481a8f37333 (diff) | |
| download | gdb-9979ab666354f355da46ba826a3efeef9fbb8b24.zip gdb-9979ab666354f355da46ba826a3efeef9fbb8b24.tar.gz gdb-9979ab666354f355da46ba826a3efeef9fbb8b24.tar.bz2 | |
binutils: doc: move artifacts back to MAINTAINERCLEANFILES
In commit 2b44a6a237 (" binutils: doc: make `make clean` clean more
things"), I moved the doc build artifacts to MOSTLYCLEANFILES, which
made them get removed by "make clean".
Because generating binutils.info requires makeinfo, and we do not want
to require makeinfo when building from the tarball, binutils.info should
not get removed by "make clean" (otherwise, it won't be included in the
tarball).
And to be consistent with other projects (e.g. ld and gas), we also want
to ship the built man pages in the tarball.
This patch puts back all these in MAINTAINERCLEANFILES, so that they are
bundled in the tarball, and only cleaned if you use "make
maintainer-clean".
Tested by building a source release and confirming they are present.
binutils/ChangeLog:
PR 25491
* doc/Makefile.am: Rename MOSTLYCLEANFILES to MAINTAINERCLEANFILES.
* doc/Makefile.in: Re-generate.
| -rw-r--r-- | binutils/ChangeLog | 6 | ||||
| -rw-r--r-- | binutils/doc/Makefile.am | 2 | ||||
| -rw-r--r-- | binutils/doc/Makefile.in | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 840fc4d..2db388d 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2020-03-06 Simon Marchi <simon.marchi@efficios.com> + + PR 25491 + * doc/Makefile.am: Rename MOSTLYCLEANFILES to MAINTAINERCLEANFILES. + * doc/Makefile.in: Re-generate. + 2020-03-06 Nick Clifton <nickc@redhat.com> * objcopy.c (check_new_section_flags): New function. Reject the diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am index a1e07ec..af6370a 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 = $(man_MANS) binutils.info cxxfilt.man +MAINTAINERCLEANFILES = $(man_MANS) binutils.info cxxfilt.man $(DEMANGLER_NAME).1: cxxfilt.man Makefile if test -f cxxfilt.man; then \ diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in index b0e7b7b..b00260b 100644 --- a/binutils/doc/Makefile.in +++ b/binutils/doc/Makefile.in @@ -429,7 +429,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 = $(man_MANS) binutils.info cxxfilt.man +MAINTAINERCLEANFILES = $(man_MANS) binutils.info cxxfilt.man all: all-am .SUFFIXES: @@ -712,7 +712,6 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: @@ -723,6 +722,7 @@ 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 |