[COMMITTED PATCH] Fix missing build dependency for binutils man pages

public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed

* [COMMITTED PATCH] Fix missing build dependency for binutils man pages
@ 2021-11-30 18:21 Roland McGrath
  2021-11-30 19:02 ` [PATCH] binutils: regenerate Makefile.in after doc/ changes Mike Frysinger
  0 siblings, 1 reply; 2+ messages in thread
From: Roland McGrath @ 2021-11-30 18:21 UTC (permalink / raw)
  To: Binutils

As was already noted, the recent binutils/doc makefile refactor broke
some cases when the build_dir/binutils/doc subdirectory didn't already
exist.
This fixes it in the obvious way.  Committed as obvious enough.

Thanks,
Roland

binutils/
2021-11-30  Roland McGrath  <mcgrathr@google.com>

        * doc/local.mk: Give each man page target its missing
dependency on
        doc/$(am__dirstamp).

diff --git a/binutils/doc/local.mk b/binutils/doc/local.mk
index 687b3f65e6c..c4980963f4b 100644
--- a/binutils/doc/local.mk
+++ b/binutils/doc/local.mk
@@ -56,105 +56,105 @@ TEXI2DVI = texi2dvi -I "$(srcdir)/%D%" -I
"$(top_srcdir)/../libiberty" \
                    -I "$(top_srcdir)/../bfd/doc" -I ../bfd/doc

 # Man page generation from texinfo
-%D%/addr2line.1:       $(binutils_TEXI)
+%D%/addr2line.1:       $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Daddr2line <
$(binutils_TEXI) > addr2line.pod
        $(AM_V_at)-($(POD2MAN) addr2line.pod | sed -e '/^.if n .na/d'
> $@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f addr2line.pod

-%D%/ar.1:      $(binutils_TEXI)
+%D%/ar.1:      $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dar < $(binutils_TEXI) >
ar.pod
        $(AM_V_at)-($(POD2MAN) ar.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f ar.pod

-%D%/dlltool.1: $(binutils_TEXI)
+%D%/dlltool.1: $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Ddlltool < $(binutils_TEXI)
> dlltool.pod
        $(AM_V_at)-($(POD2MAN) dlltool.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f dlltool.pod

-%D%/nm.1:      $(binutils_TEXI)
+%D%/nm.1:      $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dnm < $(binutils_TEXI) >
nm.pod
        $(AM_V_at)-($(POD2MAN) nm.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f nm.pod

-%D%/objcopy.1: $(binutils_TEXI)
+%D%/objcopy.1: $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dobjcopy < $(binutils_TEXI)
> objcopy.pod
        $(AM_V_at)-($(POD2MAN) objcopy.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f objcopy.pod

-%D%/objdump.1: $(binutils_TEXI)
+%D%/objdump.1: $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dobjdump < $(binutils_TEXI)
> objdump.pod
        $(AM_V_at)-($(POD2MAN) objdump.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f objdump.pod

-%D%/ranlib.1:  $(binutils_TEXI)
+%D%/ranlib.1:  $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dranlib < $(binutils_TEXI)
> ranlib.pod
        $(AM_V_at)-($(POD2MAN) ranlib.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f ranlib.pod

-%D%/readelf.1: $(binutils_TEXI)
+%D%/readelf.1: $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dreadelf < $(binutils_TEXI)
> readelf.pod
        $(AM_V_at)-($(POD2MAN) readelf.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f readelf.pod

-%D%/size.1:    $(binutils_TEXI)
+%D%/size.1:    $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dsize < $(binutils_TEXI) >
size.pod
        $(AM_V_at)-($(POD2MAN) size.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f size.pod

-%D%/strings.1: $(binutils_TEXI)
+%D%/strings.1: $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dstrings < $(binutils_TEXI)
> strings.pod
        $(AM_V_at)-($(POD2MAN) strings.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f strings.pod

-%D%/strip.1:   $(binutils_TEXI)
+%D%/strip.1:   $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dstrip < $(binutils_TEXI) >
strip.pod
        $(AM_V_at)-($(POD2MAN) strip.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f strip.pod

-%D%/elfedit.1: $(binutils_TEXI)
+%D%/elfedit.1: $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Delfedit < $(binutils_TEXI)
> elfedit.pod
        $(AM_V_at)-($(POD2MAN) elfedit.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f elfedit.pod

-%D%/windres.1: $(binutils_TEXI)
+%D%/windres.1: $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dwindres < $(binutils_TEXI)
> windres.pod
        $(AM_V_at)-($(POD2MAN) windres.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f windres.pod

-%D%/windmc.1:  $(binutils_TEXI)
+%D%/windmc.1:  $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dwindmc < $(binutils_TEXI)
> windmc.pod
        $(AM_V_at)-($(POD2MAN) windmc.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f windmc.pod

-%D%/cxxfilt.man:       $(binutils_TEXI)
+%D%/cxxfilt.man:       $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dcxxfilt < $(binutils_TEXI)
> $(DEMANGLER_NAME).pod
        $(AM_V_at)-($(POD2MAN) $(DEMANGLER_NAME).pod | sed -e '/^.if n
.na/d' > $@.T$$$$ && \
@@ -163,7 +163,7 @@ TEXI2DVI = texi2dvi -I "$(srcdir)/%D%" -I
"$(top_srcdir)/../libiberty" \
 MAINTAINERCLEANFILES += $(man_MANS) %D%/binutils.info %D%/cxxfilt.man

-%D%/$(DEMANGLER_NAME).1: %D%/cxxfilt.man Makefile
+%D%/$(DEMANGLER_NAME).1: %D%/cxxfilt.man Makefile doc/$(am__dirstamp)
        $(AM_V_GEN)if test -f %D%/cxxfilt.man; then \
          man=%D%/cxxfilt.man; \
        else \

^ permalink raw reply	[flat|nested] 2+ messages in thread

* [PATCH] binutils: regenerate Makefile.in after doc/ changes
  2021-11-30 18:21 [COMMITTED PATCH] Fix missing build dependency for binutils man pages Roland McGrath
@ 2021-11-30 19:02 ` Mike Frysinger
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger @ 2021-11-30 19:02 UTC (permalink / raw)
  To: binutils

---
 binutils/Makefile.in | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 336644a3983a..f49da1afe17b 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -2013,112 +2013,112 @@ install-exec-local: install-binPROGRAMS $(bin_PROGRAMS) $(noinst_PROGRAMS)
 	done
 
 # Man page generation from texinfo
-doc/addr2line.1:	$(binutils_TEXI)
+doc/addr2line.1:	$(binutils_TEXI) doc/$(am__dirstamp)
 	$(AM_V_GEN)touch $@
 	$(AM_V_at)-$(TEXI2POD) $(MANCONF) -Daddr2line < $(binutils_TEXI) > addr2line.pod
 	$(AM_V_at)-($(POD2MAN) addr2line.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	$(AM_V_at)rm -f addr2line.pod
 
-doc/ar.1:	$(binutils_TEXI)
+doc/ar.1:	$(binutils_TEXI) doc/$(am__dirstamp)
 	$(AM_V_GEN)touch $@
 	$(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dar < $(binutils_TEXI) > ar.pod
 	$(AM_V_at)-($(POD2MAN) ar.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	$(AM_V_at)rm -f ar.pod
 
-doc/dlltool.1:	$(binutils_TEXI)
+doc/dlltool.1:	$(binutils_TEXI) doc/$(am__dirstamp)
 	$(AM_V_GEN)touch $@
 	$(AM_V_at)-$(TEXI2POD) $(MANCONF) -Ddlltool < $(binutils_TEXI) > dlltool.pod
 	$(AM_V_at)-($(POD2MAN) dlltool.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	$(AM_V_at)rm -f dlltool.pod
 
-doc/nm.1:	$(binutils_TEXI)
+doc/nm.1:	$(binutils_TEXI) doc/$(am__dirstamp)
 	$(AM_V_GEN)touch $@
 	$(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dnm < $(binutils_TEXI) > nm.pod
 	$(AM_V_at)-($(POD2MAN) nm.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	$(AM_V_at)rm -f nm.pod
 
-doc/objcopy.1:	$(binutils_TEXI)
+doc/objcopy.1:	$(binutils_TEXI) doc/$(am__dirstamp)
 	$(AM_V_GEN)touch $@
 	$(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dobjcopy < $(binutils_TEXI) > objcopy.pod
 	$(AM_V_at)-($(POD2MAN) objcopy.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	$(AM_V_at)rm -f objcopy.pod
 
-doc/objdump.1:	$(binutils_TEXI)
+doc/objdump.1:	$(binutils_TEXI) doc/$(am__dirstamp)
 	$(AM_V_GEN)touch $@
 	$(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dobjdump < $(binutils_TEXI) > objdump.pod
 	$(AM_V_at)-($(POD2MAN) objdump.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	$(AM_V_at)rm -f objdump.pod
 
-doc/ranlib.1:	$(binutils_TEXI)
+doc/ranlib.1:	$(binutils_TEXI) doc/$(am__dirstamp)
 	$(AM_V_GEN)touch $@
 	$(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dranlib < $(binutils_TEXI) > ranlib.pod
 	$(AM_V_at)-($(POD2MAN) ranlib.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	$(AM_V_at)rm -f ranlib.pod
 
-doc/readelf.1:	$(binutils_TEXI)
+doc/readelf.1:	$(binutils_TEXI) doc/$(am__dirstamp)
 	$(AM_V_GEN)touch $@
 	$(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dreadelf < $(binutils_TEXI) > readelf.pod
 	$(AM_V_at)-($(POD2MAN) readelf.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	$(AM_V_at)rm -f readelf.pod
 
-doc/size.1:	$(binutils_TEXI)
+doc/size.1:	$(binutils_TEXI) doc/$(am__dirstamp)
 	$(AM_V_GEN)touch $@
 	$(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dsize < $(binutils_TEXI) > size.pod
 	$(AM_V_at)-($(POD2MAN) size.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	$(AM_V_at)rm -f size.pod
 
-doc/strings.1:	$(binutils_TEXI)
+doc/strings.1:	$(binutils_TEXI) doc/$(am__dirstamp)
 	$(AM_V_GEN)touch $@
 	$(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dstrings < $(binutils_TEXI) > strings.pod
 	$(AM_V_at)-($(POD2MAN) strings.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	$(AM_V_at)rm -f strings.pod
 
-doc/strip.1:	$(binutils_TEXI)
+doc/strip.1:	$(binutils_TEXI) doc/$(am__dirstamp)
 	$(AM_V_GEN)touch $@
 	$(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dstrip < $(binutils_TEXI) > strip.pod
 	$(AM_V_at)-($(POD2MAN) strip.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	$(AM_V_at)rm -f strip.pod
 
-doc/elfedit.1:	$(binutils_TEXI)
+doc/elfedit.1:	$(binutils_TEXI) doc/$(am__dirstamp)
 	$(AM_V_GEN)touch $@
 	$(AM_V_at)-$(TEXI2POD) $(MANCONF) -Delfedit < $(binutils_TEXI) > elfedit.pod
 	$(AM_V_at)-($(POD2MAN) elfedit.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	$(AM_V_at)rm -f elfedit.pod
 
-doc/windres.1:	$(binutils_TEXI)
+doc/windres.1:	$(binutils_TEXI) doc/$(am__dirstamp)
 	$(AM_V_GEN)touch $@
 	$(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dwindres < $(binutils_TEXI) > windres.pod
 	$(AM_V_at)-($(POD2MAN) windres.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	$(AM_V_at)rm -f windres.pod
 
-doc/windmc.1:	$(binutils_TEXI)
+doc/windmc.1:	$(binutils_TEXI) doc/$(am__dirstamp)
 	$(AM_V_GEN)touch $@
 	$(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dwindmc < $(binutils_TEXI) > windmc.pod
 	$(AM_V_at)-($(POD2MAN) windmc.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	$(AM_V_at)rm -f windmc.pod
 
-doc/cxxfilt.man:	$(binutils_TEXI)
+doc/cxxfilt.man:	$(binutils_TEXI) doc/$(am__dirstamp)
 	$(AM_V_GEN)touch $@
 	$(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dcxxfilt < $(binutils_TEXI) > $(DEMANGLER_NAME).pod
 	$(AM_V_at)-($(POD2MAN) $(DEMANGLER_NAME).pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	$(AM_V_at)rm -f $(DEMANGLER_NAME).pod
 
-doc/$(DEMANGLER_NAME).1: doc/cxxfilt.man Makefile
+doc/$(DEMANGLER_NAME).1: doc/cxxfilt.man Makefile doc/$(am__dirstamp)
 	$(AM_V_GEN)if test -f doc/cxxfilt.man; then \
 	  man=doc/cxxfilt.man; \
 	else \
-- 
2.33.0


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-11-30 19:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-30 18:21 [COMMITTED PATCH] Fix missing build dependency for binutils man pages Roland McGrath
2021-11-30 19:02 ` [PATCH] binutils: regenerate Makefile.in after doc/ changes Mike Frysinger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).