PATCH: Fix binutils/doc/Makefile.am
H . J . Lu
hjl@lucon.org
Tue Jul 3 09:38:00 GMT 2001
I checked in the following patch under the obvious fix rule.
H.J.
----
2001-07-03 H.J. Lu <hjl@gnu.org>
* doc/Makefile.am (addr2line.1): Use addr2line.pod instead of
$@.pod.
(ar.1): Likewise.
(dlltool.1): Likewise.
(nlmconv.1): Likewise.
(nm.1): Likewise.
(objcopy.1): Likewise.
(objdump.1): Likewise.
(ranlib.1): Likewise.
(readelf.1): Likewise.
(size.1): Likewise.
(strings.1): Likewise.
(strip.1): Likewise.
(windres.1): Likewise.
(cxxfilt.man): Use $(DEMANGLER_NAME).pod instead of $@.pod.
($(DEMANGLER_NAME).1): Also substitute cxxfilt with
$(DEMANGLER_NAME).
(as.1): Removed.
* doc/Makefile.in: Regenerated.
Index: doc/Makefile.am
===================================================================
RCS file: /work/cvs/gnu/binutils/binutils/doc/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile.am
--- doc/Makefile.am 2001/06/19 15:01:44 1.1.1.1
+++ doc/Makefile.am 2001/07/03 16:29:51
@@ -44,123 +44,112 @@ binutils.info: $(binutils_TEXI) config.t
# Man page generation from texinfo
addr2line.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Daddr2line < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Daddr2line < $< > addr2line.pod
+ -($(POD2MAN) addr2line.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f addr2line.pod
ar.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dar < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dar < $< > ar.pod
+ -($(POD2MAN) ar.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f ar.pod
dlltool.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Ddlltool < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Ddlltool < $< > dlltool.pod
+ -($(POD2MAN) dlltool.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f dlltool.pod
nlmconv.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dnlmconv < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dnlmconv < $< > nlmconv.pod
+ -($(POD2MAN) nlmconv.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f nlmconv.pod
nm.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dnm < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dnm < $< > nm.pod
+ -($(POD2MAN) nm.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f nm.pod
objcopy.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dobjcopy < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dobjcopy < $< > objcopy.pod
+ -($(POD2MAN) objcopy.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f objcopy.pod
objdump.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dobjdump < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dobjdump < $< > objdump.pod
+ -($(POD2MAN) objdump.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f objdump.pod
ranlib.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dranlib < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dranlib < $< > ranlib.pod
+ -($(POD2MAN) ranlib.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f ranlib.pod
readelf.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dreadelf < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dreadelf < $< > readelf.pod
+ -($(POD2MAN) readelf.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f readelf.pod
size.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dsize < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dsize < $< > size.pod
+ -($(POD2MAN) size.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f size.pod
strings.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dstrings < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dstrings < $< > strings.pod
+ -($(POD2MAN) strings.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f strings.pod
strip.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dstrip < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dstrip < $< > strip.pod
+ -($(POD2MAN) strip.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f strip.pod
windres.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dwindres < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dwindres < $< > windres.pod
+ -($(POD2MAN) windres.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f windres.pod
cxxfilt.man: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dcxxfilt < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dcxxfilt < $< > $(DEMANGLER_NAME).pod
+ -($(POD2MAN) $(DEMANGLER_NAME).pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f $(DEMANGLER_NAME).pod
MAINTAINERCLEANFILES = config.texi
DISTCLEANFILES = config.texi
MOSTLYCLEANFILES = $(DEMANGLER_NAME).1
$(DEMANGLER_NAME).1: cxxfilt.man Makefile
- sed -e 's/@PROGRAM@/$(DEMANGLER_NAME)/' < cxxfilt.man \
+ sed -e 's/@PROGRAM@/$(DEMANGLER_NAME)/' \
+ -e 's/cxxfilt/$(DEMANGLER_NAME)/' < cxxfilt.man \
> $(DEMANGLER_NAME).1
# Maintenance
# We need it for the taz target in ../../Makefile.in.
info: $(MANS)
-
-# Build the man page from the texinfo file
-# The sed command removes the no-adjust Nroff command so that
-# the man output looks standard.
-as.1: $(srcdir)/as.texinfo
- touch $@
- -$(TEXI2POD) $(MANCONF) < $(srcdir)/as.texinfo > as.pod
- -($(POD2MAN) as.pod | \
- sed -e '/^.if n .na/d' > $@.T$$$$ && \
- mv -f $@.T$$$$ $@) || \
- (rm -f $@.T$$$$ && exit 1)
- rm -f as.pod
Index: doc/Makefile.in
===================================================================
RCS file: /work/cvs/gnu/binutils/binutils/doc/Makefile.in,v
retrieving revision 1.1.1.2
diff -u -p -r1.1.1.2 Makefile.in
--- doc/Makefile.in 2001/06/19 18:25:30 1.1.1.2
+++ doc/Makefile.in 2001/07/03 16:29:51
@@ -439,122 +439,111 @@ binutils.info: $(binutils_TEXI) config.t
# Man page generation from texinfo
addr2line.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Daddr2line < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Daddr2line < $< > addr2line.pod
+ -($(POD2MAN) addr2line.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f addr2line.pod
ar.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dar < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dar < $< > ar.pod
+ -($(POD2MAN) ar.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f ar.pod
dlltool.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Ddlltool < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Ddlltool < $< > dlltool.pod
+ -($(POD2MAN) dlltool.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f dlltool.pod
nlmconv.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dnlmconv < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dnlmconv < $< > nlmconv.pod
+ -($(POD2MAN) nlmconv.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f nlmconv.pod
nm.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dnm < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dnm < $< > nm.pod
+ -($(POD2MAN) nm.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f nm.pod
objcopy.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dobjcopy < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dobjcopy < $< > objcopy.pod
+ -($(POD2MAN) objcopy.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f objcopy.pod
objdump.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dobjdump < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dobjdump < $< > objdump.pod
+ -($(POD2MAN) objdump.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f objdump.pod
ranlib.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dranlib < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dranlib < $< > ranlib.pod
+ -($(POD2MAN) ranlib.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f ranlib.pod
readelf.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dreadelf < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dreadelf < $< > readelf.pod
+ -($(POD2MAN) readelf.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f readelf.pod
size.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dsize < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dsize < $< > size.pod
+ -($(POD2MAN) size.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f size.pod
strings.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dstrings < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dstrings < $< > strings.pod
+ -($(POD2MAN) strings.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f strings.pod
strip.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dstrip < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dstrip < $< > strip.pod
+ -($(POD2MAN) strip.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f strip.pod
windres.1: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dwindres < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dwindres < $< > windres.pod
+ -($(POD2MAN) windres.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f windres.pod
cxxfilt.man: $(binutils_TEXI)
touch $@
- -$(TEXI2POD) $(MANCONF) -Dcxxfilt < $< > $@.pod
- -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+ -$(TEXI2POD) $(MANCONF) -Dcxxfilt < $< > $(DEMANGLER_NAME).pod
+ -($(POD2MAN) $(DEMANGLER_NAME).pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
- rm -f $@.pod
+ rm -f $(DEMANGLER_NAME).pod
$(DEMANGLER_NAME).1: cxxfilt.man Makefile
- sed -e 's/@PROGRAM@/$(DEMANGLER_NAME)/' < cxxfilt.man \
+ sed -e 's/@PROGRAM@/$(DEMANGLER_NAME)/' \
+ -e 's/cxxfilt/$(DEMANGLER_NAME)/' < cxxfilt.man \
> $(DEMANGLER_NAME).1
# Maintenance
# We need it for the taz target in ../../Makefile.in.
info: $(MANS)
-
-# Build the man page from the texinfo file
-# The sed command removes the no-adjust Nroff command so that
-# the man output looks standard.
-as.1: $(srcdir)/as.texinfo
- touch $@
- -$(TEXI2POD) $(MANCONF) < $(srcdir)/as.texinfo > as.pod
- -($(POD2MAN) as.pod | \
- sed -e '/^.if n .na/d' > $@.T$$$$ && \
- mv -f $@.T$$$$ $@) || \
- (rm -f $@.T$$$$ && exit 1)
- rm -f as.pod
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
More information about the Binutils
mailing list