This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Re: Bad commit (Re: Should we remove those man pages from CVS?)
On Tue, Jun 19, 2001 at 05:29:02PM +0100, Nick Clifton wrote:
> > > I had some problems getting the Makefile.am file to run through
> > > automake however, so in the end I had to massage the resulting
> >
> > What problems? How can I reproduce them. I can take a look.
>
> Running 'automake' in binutils/doc fails because there is no
> configure.in file.
>
It works for me. I did
1. In the source tree,
# cd binutils/doc
# rm Makefile.in
2. In the source tree
# cd binutils/doc
# make Makefile.in
cd /home/hjl/work/linux/import/binutils/binutils && automake --cygnus
doc/Makefile
cd .. \
&& CONFIG_FILES=doc/Makefile CONFIG_HEADERS= /bin/sh ./config.status
creating doc/Makefile
I checked in the following patch under the obvious fix rule.
H.J.
---
2001-06-19 H.J. Lu <hjl@gnu.org>
* doc/Makefile.in: Regenerated.
Index: doc/Makefile.in
===================================================================
RCS file: /cvs/src/src/binutils/doc/Makefile.in,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.in
--- Makefile.in 2001/06/19 11:57:29 1.1
+++ Makefile.in 2001/06/19 18:15:36
@@ -63,10 +63,61 @@ host_alias = @host_alias@
host_triplet = @host@
target_alias = @target_alias@
target_triplet = @target@
+AR = @AR@
+AS = @AS@
+BUILD_DLLTOOL = @BUILD_DLLTOOL@
+BUILD_DLLWRAP = @BUILD_DLLWRAP@
+BUILD_MISC = @BUILD_MISC@
+BUILD_NLMCONV = @BUILD_NLMCONV@
+BUILD_SRCONV = @BUILD_SRCONV@
+BUILD_WINDRES = @BUILD_WINDRES@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+DATADIRNAME = @DATADIRNAME@
+DEMANGLER_NAME = @DEMANGLER_NAME@
+DLLTOOL = @DLLTOOL@
+DLLTOOL_DEFS = @DLLTOOL_DEFS@
EXEEXT = @EXEEXT@
+EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GT_NO = @GT_NO@
+GT_YES = @GT_YES@
+HDEFINES = @HDEFINES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTOBJEXT = @INSTOBJEXT@
+INTLDEPS = @INTLDEPS@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+LEX = @LEX@
LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+NLMCONV_DEFS = @NLMCONV_DEFS@
+OBJDUMP = @OBJDUMP@
+OBJDUMP_DEFS = @OBJDUMP_DEFS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+POFILES = @POFILES@
+POSUB = @POSUB@
RANLIB = @RANLIB@
+STRIP = @STRIP@
+UNDERSCORE = @UNDERSCORE@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+YACC = @YACC@
+l = @l@
AUTOMAKE_OPTIONS = cygnus
@@ -100,14 +151,14 @@ man_MANS = \
info_TEXINFOS = binutils.texi
-BINUTILS_TEXI = $(srcdir)/binutils.texi
+binutils_TEXI = $(srcdir)/binutils.texi
MAINTAINERCLEANFILES = config.texi
DISTCLEANFILES = config.texi
MOSTLYCLEANFILES = $(DEMANGLER_NAME).1
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
-MAKEINFO = `if test -f $(top_builddir)/../texinfo/makeinfo/makeinfo; then echo $(top_builddir)/../texinfo/makeinfo/makeinfo; else echo makeinfo; fi`
TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then echo $(top_srcdir)/../texinfo/util/texi2dvi; else echo texi2dvi; fi`
TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
INFO_DEPS = binutils.info
@@ -294,41 +345,7 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
subdir = doc
-# This target untars the dist file and tries a VPATH configuration. Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
- -rm -rf $(distdir)
- GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
- mkdir $(distdir)/=build
- mkdir $(distdir)/=inst
- dc_install_base=`cd $(distdir)/=inst && pwd`; \
- cd $(distdir)/=build \
- && ../configure --srcdir=.. --prefix=$$dc_install_base \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
- && $(MAKE) $(AM_MAKEFLAGS) dist
- -rm -rf $(distdir)
- @banner="$(distdir).tar.gz is ready for distribution"; \
- dashes=`echo "$$banner" | sed s/./=/g`; \
- echo "$$dashes"; \
- echo "$$banner"; \
- echo "$$dashes"
-dist: distdir
- -chmod -R a+r $(distdir)
- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
- -rm -rf $(distdir)
-dist-all: distdir
- -chmod -R a+r $(distdir)
- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
- -rm -rf $(distdir)
distdir: $(DISTFILES)
- -rm -rf $(distdir)
- mkdir $(distdir)
- -chmod 777 $(distdir)
@for file in $(DISTFILES); do \
if test -f $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
@@ -415,103 +432,103 @@ config.texi: Makefile
rm -f config.texi
echo '@set VERSION $(VERSION)' > config.texi
-binutils.dvi: $(BINUTILS_TEXI) config.texi
+binutils.dvi: $(binutils_TEXI) config.texi
-binutils.info: $(BINUTILS_TEXI) config.texi
+binutils.info: $(binutils_TEXI) config.texi
# Man page generation from texinfo
-addr2line.1: $(BINUTILS_TEXI)
+addr2line.1: $(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
-ar.1: $(BINUTILS_TEXI)
+ar.1: $(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
-dlltool.1: $(BINUTILS_TEXI)
+dlltool.1: $(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
-nlmconv.1: $(BINUTILS_TEXI)
+nlmconv.1: $(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
-nm.1: $(BINUTILS_TEXI)
+nm.1: $(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
-objcopy.1: $(BINUTILS_TEXI)
+objcopy.1: $(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
-objdump.1: $(BINUTILS_TEXI)
+objdump.1: $(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
-ranlib.1: $(BINUTILS_TEXI)
+ranlib.1: $(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
-readelf.1: $(BINUTILS_TEXI)
+readelf.1: $(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
-size.1: $(BINUTILS_TEXI)
+size.1: $(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
-strings.1: $(BINUTILS_TEXI)
+strings.1: $(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
-strip.1: $(BINUTILS_TEXI)
+strip.1: $(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
-windres.1: $(BINUTILS_TEXI)
+windres.1: $(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
-cxxfilt.man: $(BINUTILS_TEXI)
+cxxfilt.man: $(binutils_TEXI)
touch $@
-$(TEXI2POD) $(MANCONF) -Dcxxfilt < $< > $@.pod
-($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \