Re: Should we remove those man pages from CVS?

["H . J . Lu" <hjl at lucon dot org>]

On Sun, Jun 17, 2001 at 10:35:23AM +0100, Nick Clifton wrote:
> Hi H.J.
> 
> > Should we remove those man pages from CVS? See
> > 
> > http://sources.redhat.com/ml/binutils/2001-06/msg00266.html
> > 
> > I can provide a patch to do it.
> 
> Good idea - please do so.
> 

Here is it. I did

# make binutils.tar.bz2 -f Makefile.in

All the man pages are generated along with the info pages and included
in the tarball.


H.J.
----
2001-06-17  H.J. Lu <hjl@gnu.org>

	* Makefile.am (diststuff): Add $(MANS).
	(addr2line.1): Remove the prefix `$(srcdir)/'.
	(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): Likewise.
	($(DEMANGLER_NAME).1): Likewise.
	* Makefile.in: Regenerated.

	* addr2line.1: Removed.
	* 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: Likewise.

2001-06-17  H.J. Lu <hjl@gnu.org>

	* doc/Makefile.am (info): Depend on $(MANS).
	(as.1): Remove the prefix `$(srcdir)/'.
	* doc/Makefile.in: Regenerated.

	* as.1: Removed.

2001-06-17  H.J. Lu <hjl@gnu.org>

	* Makefile.am (diststuff): Add $(MANS).
	(gprof.1): Remove the prefix `$(srcdir)/'.
	* Makefile.in: Regenerated.

	* gprof.1: Removed.

2001-06-17  H.J. Lu <hjl@gnu.org>

	* Makefile.am (ld.1): Remove the prefix `$(srcdir)/'.
	(diststuff): Add $(MANS).
	* Makefile.in: Regenerated.

	* ld.1: Removed.

Index: binutils/Makefile.am
===================================================================
RCS file: /work/cvs/gnu/binutils/binutils/Makefile.am,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile.am
--- binutils/Makefile.am	2001/03/28 19:21:27	1.19
+++ binutils/Makefile.am	2001/06/17 18:51:48
@@ -300,7 +300,7 @@ dllwrap_LDADD = $(LIBIBERTY) $(INTLLIBS)
 DISTSTUFF = arparse.c arparse.h arlex.c nlmheader.c sysinfo.c sysinfo.h \
 	syslex.c deflex.c defparse.h defparse.c rclex.c rcparse.h rcparse.c
 
-diststuff: $(DISTSTUFF) info
+diststuff: $(DISTSTUFF) info $(MANS)
 
 DISTCLEANFILES = stamp-under sysinfo underscore.c sysroff.c sysroff.h \
 	site.exp site.bak
@@ -360,98 +360,98 @@ binutils.dvi: $(srcdir)/binutils.texi co
 binutils.info: $(srcdir)/binutils.texi config.texi
 
 # Man page generation from texinfo
-$(srcdir)/addr2line.1:	$(srcdir)/binutils.texi
+addr2line.1:	$(srcdir)/binutils.texi
 	touch $@
 	-$(TEXI2POD) $(MANCONF) -Daddr2line < $< > $@.pod
 	-($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f $@.pod
 
-$(srcdir)/ar.1:	$(srcdir)/binutils.texi
+ar.1:	$(srcdir)/binutils.texi
 	touch $@
 	-$(TEXI2POD) $(MANCONF) -Dar < $< > $@.pod
 	-($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f $@.pod
 
-$(srcdir)/dlltool.1:	$(srcdir)/binutils.texi
+dlltool.1:	$(srcdir)/binutils.texi
 	touch $@
 	-$(TEXI2POD) $(MANCONF) -Ddlltool < $< > $@.pod
 	-($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f $@.pod
 
-$(srcdir)/nlmconv.1:	$(srcdir)/binutils.texi
+nlmconv.1:	$(srcdir)/binutils.texi
 	touch $@
 	-$(TEXI2POD) $(MANCONF) -Dnlmconv < $< > $@.pod
 	-($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f $@.pod
 
-$(srcdir)/nm.1:	$(srcdir)/binutils.texi
+nm.1:	$(srcdir)/binutils.texi
 	touch $@
 	-$(TEXI2POD) $(MANCONF) -Dnm < $< > $@.pod
 	-($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f $@.pod
 
-$(srcdir)/objcopy.1:	$(srcdir)/binutils.texi
+objcopy.1:	$(srcdir)/binutils.texi
 	touch $@
 	-$(TEXI2POD) $(MANCONF) -Dobjcopy < $< > $@.pod
 	-($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f $@.pod
 
-$(srcdir)/objdump.1:	$(srcdir)/binutils.texi
+objdump.1:	$(srcdir)/binutils.texi
 	touch $@
 	-$(TEXI2POD) $(MANCONF) -Dobjdump < $< > $@.pod
 	-($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f $@.pod
 
-$(srcdir)/ranlib.1:	$(srcdir)/binutils.texi
+ranlib.1:	$(srcdir)/binutils.texi
 	touch $@
 	-$(TEXI2POD) $(MANCONF) -Dranlib < $< > $@.pod
 	-($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f $@.pod
 
-$(srcdir)/readelf.1:	$(srcdir)/binutils.texi
+readelf.1:	$(srcdir)/binutils.texi
 	touch $@
 	-$(TEXI2POD) $(MANCONF) -Dreadelf < $< > $@.pod
 	-($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f $@.pod
 
-$(srcdir)/size.1:	$(srcdir)/binutils.texi
+size.1:	$(srcdir)/binutils.texi
 	touch $@
 	-$(TEXI2POD) $(MANCONF) -Dsize < $< > $@.pod
 	-($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f $@.pod
 
-$(srcdir)/strings.1:	$(srcdir)/binutils.texi
+strings.1:	$(srcdir)/binutils.texi
 	touch $@
 	-$(TEXI2POD) $(MANCONF) -Dstrings < $< > $@.pod
 	-($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f $@.pod
 
-$(srcdir)/strip.1:	$(srcdir)/binutils.texi
+strip.1:	$(srcdir)/binutils.texi
 	touch $@
 	-$(TEXI2POD) $(MANCONF) -Dstrip < $< > $@.pod
 	-($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f $@.pod
 
-$(srcdir)/windres.1:	$(srcdir)/binutils.texi
+windres.1:	$(srcdir)/binutils.texi
 	touch $@
 	-$(TEXI2POD) $(MANCONF) -Dwindres < $< > $@.pod
 	-($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f $@.pod
 
-$(srcdir)/cxxfilt.man:	$(srcdir)/binutils.texi
+cxxfilt.man:	$(srcdir)/binutils.texi
 	touch $@
 	-$(TEXI2POD) $(MANCONF) -Dcxxfilt < $< > $@.pod
 	-($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
@@ -461,7 +461,7 @@ $(srcdir)/cxxfilt.man:	$(srcdir)/binutil
 MAINTAINERCLEANFILES = config.texi
 
 $(DEMANGLER_NAME).1: cxxfilt.man Makefile
-	sed -e 's/@PROGRAM@/$(DEMANGLER_NAME)/' < $(srcdir)/cxxfilt.man \
+	sed -e 's/@PROGRAM@/$(DEMANGLER_NAME)/' < cxxfilt.man \
 		> $(DEMANGLER_NAME).1
 
 MOSTLYCLEANFILES = sysinfo $(DEMANGLER_NAME).1 binutils.log binutils.sum \
Index: gas/doc/Makefile.am
===================================================================
RCS file: /work/cvs/gnu/binutils/gas/doc/Makefile.am,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile.am
--- gas/doc/Makefile.am	2001/03/27 16:55:14	1.9
+++ gas/doc/Makefile.am	2001/06/17 18:51:48
@@ -63,16 +63,19 @@ DISTCLEANFILES = asconfig.texi
 
 MAINTAINERCLEANFILES = gasver.texi
 
+# We need it for the taz target in ../../Makefile.in.
+info: $(MANS)
+
 # Maintenance
 
 # Build the man page from the texinfo file
 # The sed command removes the no-adjust Nroff command so that
 # the man output looks standard.
-$(srcdir)/as.1: $(srcdir)/as.texinfo
-	touch $(srcdir)/as.1
+as.1: $(srcdir)/as.texinfo
+	touch $@
 	-$(TEXI2POD) $(MANCONF) < $(srcdir)/as.texinfo > as.pod
 	-($(POD2MAN) as.pod | \
-		sed -e '/^.if n .na/d' > $(srcdir)/as.1.T$$$$ && \
-		mv -f $(srcdir)/as.1.T$$$$ $(srcdir)/as.1) || \
-		(rm -f $(srcdir)/as.1.T$$$$ && exit 1)
-
+		sed -e '/^.if n .na/d' > $@.T$$$$ && \
+		mv -f $@.T$$$$ $@) || \
+		(rm -f $@.T$$$$ && exit 1)
+	rm -f as.pod
Index: gprof/Makefile.am
===================================================================
RCS file: /work/cvs/gnu/binutils/gprof/Makefile.am,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile.am
--- gprof/Makefile.am	2001/04/06 22:50:33	1.10
+++ gprof/Makefile.am	2001/06/17 18:51:48
@@ -37,7 +37,7 @@ EXTRA_DIST = flat_bl.c bsd_callg_bl.c fs
 
 BUILT_SOURCES = flat_bl.c bsd_callg_bl.c fsf_callg_bl.c
 
-diststuff: $(BUILT_SOURCES) info
+diststuff: $(BUILT_SOURCES) info $(MANS)
 
 .m.c:
 	awk -f $(srcdir)/gen-c-prog.awk > ./$*.c \
@@ -61,13 +61,13 @@ man_MANS = gprof.1
 # Build the man page from the texinfo file
 # The sed command removes the no-adjust Nroff command so that
 # the man output looks standard.
-$(srcdir)/gprof.1: $(srcdir)/gprof.texi
-	touch $(srcdir)/gprof.1
+gprof.1: $(srcdir)/gprof.texi
+	touch $@
 	-$(TEXI2POD) $(MANCONF) -Dgprof < $(srcdir)/gprof.texi > gprof.pod
 	-($(POD2MAN) gprof.pod | \
-		sed -e '/^.if n .na/d' > $(srcdir)/gprof.1.T$$$$ && \
-		mv -f $(srcdir)/gprof.1.T$$$$ $(srcdir)/gprof.1) || \
-		(rm -f $(srcdir)/gprof.1.T$$$$ && exit 1)
+		sed -e '/^.if n .na/d' > $@.T$$$$ && \
+		mv -f $@.T$$$$ $@) || \
+		(rm -f $@.T$$$$ && exit 1)
 	rm -f gprof.pod
 
 # Targets to rebuild dependencies in this Makefile.
Index: ld/Makefile.am
===================================================================
RCS file: /work/cvs/gnu/binutils/ld/Makefile.am,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile.am
--- ld/Makefile.am	2001/05/25 06:17:13	1.49
+++ ld/Makefile.am	2001/06/17 18:51:48
@@ -934,13 +934,14 @@ ld.dvi: $(srcdir)/ld.texinfo configdoc.t
 # Build the man page from the texinfo file
 # The sed command removes the no-adjust Nroff command so that
 # the man output looks standard.
-$(srcdir)/ld.1: $(srcdir)/ld.texinfo
-	touch $(srcdir)/ld.1
+ld.1: $(srcdir)/ld.texinfo
+	touch $@
 	-$(TEXI2POD) $(MANCONF) < $(srcdir)/ld.texinfo > ld.pod
 	-($(POD2MAN) ld.pod | \
-		sed -e '/^.if n .na/d' > $(srcdir)/ld.1.T$$$$ && \
-		mv -f $(srcdir)/ld.1.T$$$$ $(srcdir)/ld.1) || \
-		(rm -f $(srcdir)/ld.1.T$$$$ && exit 1)
+		sed -e '/^.if n .na/d' > $@.T$$$$ && \
+		mv -f $@.T$$$$ $@) || \
+		(rm -f $@.T$$$$ && exit 1)
+	rm -f ld.pod
 
 MAINTAINERCLEANFILES = ldver.texi
 
@@ -980,7 +981,7 @@ install-data-local:
 # Stuff that should be included in a distribution.  The diststuff
 # target is run by the taz target in ../Makefile.in.
 LDDISTSTUFF = ldgram.c ldgram.h ldlex.c
-diststuff: $(LDDISTSTUFF) info
+diststuff: $(LDDISTSTUFF) info $(MANS)
 
 DISTCLEANFILES = tdirs site.exp site.bak stringify.sed
 distclean-local: