From 89ae5e692398f008d06a8e38d1b531131f41a683 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 18 Sep 2019 09:11:13 -0400 Subject: [PATCH] binutils: doc: remove binutils_TEXINFOS usages This variable doesn't exist (it evaluates to nothing). It was introduced in commit 42ecbf5edab08ee88b37d9fbd8542f5f25ce51ae Author: Daniel Jacobowitz Date: Sun May 15 18:19:45 2005 +0000 And removed in commit c428fa83c21769fafedcebb7b4a381c6ca24f998 Author: H.J. Lu Date: Thu Mar 15 14:17:20 2007 +0000 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: Remove references to binutils_TEXINFOS. * doc/Makefile.in: Re-generate. --- binutils/ChangeLog | 5 +++++ binutils/doc/Makefile.am | 30 +++++++++++++++--------------- binutils/doc/Makefile.in | 30 +++++++++++++++--------------- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index f4b1252d033..5c424d62689 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2019-09-18 Simon Marchi + + * doc/Makefile.am: Remove references to binutils_TEXINFOS. + * doc/Makefile.in: Re-generate. + 2019-09-18 Simon Marchi * doc/Makefile.am (install-data-loca): Remove target. diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am index 248e7cdcf34..9eabaa7a611 100644 --- a/binutils/doc/Makefile.am +++ b/binutils/doc/Makefile.am @@ -57,105 +57,105 @@ TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \ -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc # Man page generation from texinfo -addr2line.1: $(binutils_TEXI) $(binutils_TEXINFOS) +addr2line.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Daddr2line < $(binutils_TEXI) > addr2line.pod -($(POD2MAN) addr2line.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f addr2line.pod -ar.1: $(binutils_TEXI) $(binutils_TEXINFOS) +ar.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dar < $(binutils_TEXI) > ar.pod -($(POD2MAN) ar.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f ar.pod -dlltool.1: $(binutils_TEXI) $(binutils_TEXINFOS) +dlltool.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Ddlltool < $(binutils_TEXI) > dlltool.pod -($(POD2MAN) dlltool.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f dlltool.pod -nm.1: $(binutils_TEXI) $(binutils_TEXINFOS) +nm.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dnm < $(binutils_TEXI) > nm.pod -($(POD2MAN) nm.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f nm.pod -objcopy.1: $(binutils_TEXI) $(binutils_TEXINFOS) +objcopy.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dobjcopy < $(binutils_TEXI) > objcopy.pod -($(POD2MAN) objcopy.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f objcopy.pod -objdump.1: $(binutils_TEXI) $(binutils_TEXINFOS) +objdump.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dobjdump < $(binutils_TEXI) > objdump.pod -($(POD2MAN) objdump.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f objdump.pod -ranlib.1: $(binutils_TEXI) $(binutils_TEXINFOS) +ranlib.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dranlib < $(binutils_TEXI) > ranlib.pod -($(POD2MAN) ranlib.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f ranlib.pod -readelf.1: $(binutils_TEXI) $(binutils_TEXINFOS) +readelf.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dreadelf < $(binutils_TEXI) > readelf.pod -($(POD2MAN) readelf.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f readelf.pod -size.1: $(binutils_TEXI) $(binutils_TEXINFOS) +size.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dsize < $(binutils_TEXI) > size.pod -($(POD2MAN) size.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f size.pod -strings.1: $(binutils_TEXI) $(binutils_TEXINFOS) +strings.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dstrings < $(binutils_TEXI) > strings.pod -($(POD2MAN) strings.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f strings.pod -strip.1: $(binutils_TEXI) $(binutils_TEXINFOS) +strip.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dstrip < $(binutils_TEXI) > strip.pod -($(POD2MAN) strip.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f strip.pod -elfedit.1: $(binutils_TEXI) $(binutils_TEXINFOS) +elfedit.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Delfedit < $(binutils_TEXI) > elfedit.pod -($(POD2MAN) elfedit.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f elfedit.pod -windres.1: $(binutils_TEXI) $(binutils_TEXINFOS) +windres.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dwindres < $(binutils_TEXI) > windres.pod -($(POD2MAN) windres.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f windres.pod -windmc.1: $(binutils_TEXI) $(binutils_TEXINFOS) +windmc.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dwindmc < $(binutils_TEXI) > windmc.pod -($(POD2MAN) windmc.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f windmc.pod -cxxfilt.man: $(binutils_TEXI) $(binutils_TEXINFOS) +cxxfilt.man: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dcxxfilt < $(binutils_TEXI) > $(DEMANGLER_NAME).pod -($(POD2MAN) $(DEMANGLER_NAME).pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in index 76838757ec3..73600fb2efb 100644 --- a/binutils/doc/Makefile.in +++ b/binutils/doc/Makefile.in @@ -906,105 +906,105 @@ uninstall-man: uninstall-man1 # Man page generation from texinfo -addr2line.1: $(binutils_TEXI) $(binutils_TEXINFOS) +addr2line.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Daddr2line < $(binutils_TEXI) > addr2line.pod -($(POD2MAN) addr2line.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f addr2line.pod -ar.1: $(binutils_TEXI) $(binutils_TEXINFOS) +ar.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dar < $(binutils_TEXI) > ar.pod -($(POD2MAN) ar.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f ar.pod -dlltool.1: $(binutils_TEXI) $(binutils_TEXINFOS) +dlltool.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Ddlltool < $(binutils_TEXI) > dlltool.pod -($(POD2MAN) dlltool.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f dlltool.pod -nm.1: $(binutils_TEXI) $(binutils_TEXINFOS) +nm.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dnm < $(binutils_TEXI) > nm.pod -($(POD2MAN) nm.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f nm.pod -objcopy.1: $(binutils_TEXI) $(binutils_TEXINFOS) +objcopy.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dobjcopy < $(binutils_TEXI) > objcopy.pod -($(POD2MAN) objcopy.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f objcopy.pod -objdump.1: $(binutils_TEXI) $(binutils_TEXINFOS) +objdump.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dobjdump < $(binutils_TEXI) > objdump.pod -($(POD2MAN) objdump.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f objdump.pod -ranlib.1: $(binutils_TEXI) $(binutils_TEXINFOS) +ranlib.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dranlib < $(binutils_TEXI) > ranlib.pod -($(POD2MAN) ranlib.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f ranlib.pod -readelf.1: $(binutils_TEXI) $(binutils_TEXINFOS) +readelf.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dreadelf < $(binutils_TEXI) > readelf.pod -($(POD2MAN) readelf.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f readelf.pod -size.1: $(binutils_TEXI) $(binutils_TEXINFOS) +size.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dsize < $(binutils_TEXI) > size.pod -($(POD2MAN) size.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f size.pod -strings.1: $(binutils_TEXI) $(binutils_TEXINFOS) +strings.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dstrings < $(binutils_TEXI) > strings.pod -($(POD2MAN) strings.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f strings.pod -strip.1: $(binutils_TEXI) $(binutils_TEXINFOS) +strip.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dstrip < $(binutils_TEXI) > strip.pod -($(POD2MAN) strip.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f strip.pod -elfedit.1: $(binutils_TEXI) $(binutils_TEXINFOS) +elfedit.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Delfedit < $(binutils_TEXI) > elfedit.pod -($(POD2MAN) elfedit.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f elfedit.pod -windres.1: $(binutils_TEXI) $(binutils_TEXINFOS) +windres.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dwindres < $(binutils_TEXI) > windres.pod -($(POD2MAN) windres.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f windres.pod -windmc.1: $(binutils_TEXI) $(binutils_TEXINFOS) +windmc.1: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dwindmc < $(binutils_TEXI) > windmc.pod -($(POD2MAN) windmc.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f windmc.pod -cxxfilt.man: $(binutils_TEXI) $(binutils_TEXINFOS) +cxxfilt.man: $(binutils_TEXI) touch $@ -$(TEXI2POD) $(MANCONF) -Dcxxfilt < $(binutils_TEXI) > $(DEMANGLER_NAME).pod -($(POD2MAN) $(DEMANGLER_NAME).pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ -- 2.39.2