diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2007-03-15 14:17:20 +0000 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2007-03-15 14:17:20 +0000 |
commit | c428fa83c21769fafedcebb7b4a381c6ca24f998 (patch) | |
tree | 495dd739a73402206ab116758c5e19246f8de8da /binutils/doc | |
parent | 794ba86ab2c3af917bb30776338526a18ea74880 (diff) | |
download | gdb-c428fa83c21769fafedcebb7b4a381c6ca24f998.zip gdb-c428fa83c21769fafedcebb7b4a381c6ca24f998.tar.gz gdb-c428fa83c21769fafedcebb7b4a381c6ca24f998.tar.bz2 |
bfd/
2007-03-15 H.J. Lu <hongjiu.lu@intel.com>
* Makefile.am (bfdver.h): Substitute report_bugs_to. Also
create doc/bfdver.texi.
* Makefile.in: Regenerated.
* configure.in (--with-bugurl): New option.
* configure: Regenerated.
* version.h (REPORT_BUGS_TO): New.
binutils/
2007-03-15 H.J. Lu <hongjiu.lu@intel.com>
* Makefile.am (REPORT_BUGS_TO): Removed.
(INCLUDES): Remove -DREPORT_BUGS_TO.
* Makefile.in: Regenerated.
* bucomm.c: Don't include bfdver.h.
* objdump.c: Likewise.
* version.c: Likewise.
* bucomm.h: Include bfdver.h.
* configure.in (--with-bugurl): Removed.
* configure: Regenerated.
* doc/Makefile.am (binutils_TEXINFOS): Removed.
(AM_MAKEINFOFLAGS): Add -I ../../bfd/doc.
(TEXI2DVI): Likewise.
(config.texi): Removed.
(MOSTLYCLEANFILES): Remove config.texi.
* doc/Makefile.in: Regenerated.
* doc/binutils.texi: Include bfdver.texi instead of
config.texi.
gas/
2007-03-15 H.J. Lu <hongjiu.lu@intel.com>
* Makefile.am (REPORT_BUGS_TO): Removed.
(INCLUDES): Remove -DREPORT_BUGS_TO.
* Makefile.in: Regenerated.
* configure.in (--with-bugurl): Removed.
* configure: Regenerated.
* doc/Makefile.am (as_TEXINFOS): Remove gasver.texi.
(AM_MAKEINFOFLAGS): Add -I ../../bfd/doc.
(TEXI2DVI): Likewise.
(gasver.texi): Removed.
(MOSTLYCLEANFILES): Remove gasver.texi.
(as.1): Don't depend on gasver.texi.
* doc/Makefile.in: Regenerated.
* doc/as.texi: Include bfdver.texi instead of gasver.texi.
gprof/
2007-03-15 H.J. Lu <hongjiu.lu@intel.com>
* Makefile.am (REPORT_BUGS_TO): Removed.
(INCLUDES): Remove -DREPORT_BUGS_TO.
* Makefile.in: Regenerated.
* configure.in (--with-bugurl): Removed.
* configure: Regenerated.
ld/
2007-03-15 H.J. Lu <hongjiu.lu@intel.com>
* Makefile.am (ld_TEXINFOS): Remove ldver.texi.
(AM_MAKEINFOFLAGS): Add -I ../../bfd/doc.
(TEXI2DVI): Likewise.
(REPORT_BUGS_TO): Removed.
(INCLUDES): Remove -DREPORT_BUGS_TO.
(ldver.texi): Likewise.
(ld.1): Don't depend on ldver.texi.
(MOSTLYCLEANFILES): Remove ldver.texi.
* Makefile.in: Regenerated.
* configure.in (--with-bugurl): Removed.
* configure: Regenerated.
* lexsup.c: Include bfdver.h.
* ld.texinfo: Include bfdver.texi instead of ldver.texi.
Diffstat (limited to 'binutils/doc')
-rw-r--r-- | binutils/doc/Makefile.am | 19 | ||||
-rw-r--r-- | binutils/doc/Makefile.in | 37 | ||||
-rw-r--r-- | binutils/doc/binutils.texi | 2 |
3 files changed, 20 insertions, 38 deletions
diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am index 966ed80..5d8520c 100644 --- a/binutils/doc/Makefile.am +++ b/binutils/doc/Makefile.am @@ -31,20 +31,12 @@ man_MANS = \ $(DEMANGLER_NAME).1 info_TEXINFOS = binutils.texi -binutils_TEXINFOS = config.texi binutils_TEXI = $(srcdir)/binutils.texi -AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" -TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" - -config.texi: $(srcdir)/../../bfd/configure $(binutils_TEXI) - rm -f config.texi - eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \ - echo "@set VERSION $$VERSION" > $@ - echo "@set UPDATED `date '+%B %Y'`" >> config.texi - if [ -n "$(REPORT_BUGS_TEXI)" ]; then \ - echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> config.texi; \ - fi +AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \ + -I ../../bfd/doc +TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \ + -I ../../bfd/doc # Man page generation from texinfo addr2line.1: $(binutils_TEXI) $(binutils_TEXINFOS) @@ -145,7 +137,6 @@ cxxfilt.man: $(binutils_TEXI) $(binutils_TEXINFOS) mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f $(DEMANGLER_NAME).pod -MAINTAINERCLEANFILES = config.texi MOSTLYCLEANFILES = $(DEMANGLER_NAME).1 $(DEMANGLER_NAME).1: cxxfilt.man Makefile @@ -183,7 +174,7 @@ install-html-am: $(HTMLS) fi; \ done -MAINTAINERCLEANFILES += binutils.info +MAINTAINERCLEANFILES = binutils.info # Automake 1.9 will only build info files in the objdir if they are # mentioned in DISTCLEANFILES. It doesn't have to be unconditional, diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in index cefd826..be7ad95 100644 --- a/binutils/doc/Makefile.in +++ b/binutils/doc/Makefile.in @@ -37,8 +37,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = doc -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(binutils_TEXINFOS) +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/../bfd/acinclude.m4 \ @@ -153,8 +152,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ -REPORT_BUGS_TEXI = @REPORT_BUGS_TEXI@ -REPORT_BUGS_TO = @REPORT_BUGS_TO@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -238,13 +235,16 @@ man_MANS = \ $(DEMANGLER_NAME).1 info_TEXINFOS = binutils.texi -binutils_TEXINFOS = config.texi binutils_TEXI = $(srcdir)/binutils.texi -AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" -TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" -MAINTAINERCLEANFILES = config.texi binutils.info +AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \ + -I ../../bfd/doc + +TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \ + -I ../../bfd/doc + MOSTLYCLEANFILES = $(DEMANGLER_NAME).1 html__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +MAINTAINERCLEANFILES = binutils.info # Automake 1.9 will only build info files in the objdir if they are # mentioned in DISTCLEANFILES. It doesn't have to be unconditional, @@ -263,9 +263,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus doc/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign doc/Makefile + $(AUTOMAKE) --cygnus doc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -293,7 +293,7 @@ clean-libtool: distclean-libtool: -rm -f libtool -binutils.info: binutils.texi $(binutils_TEXINFOS) +binutils.info: binutils.texi restore=: && backupdir="$(am__leading_dot)am$$$$" && \ rm -rf $$backupdir && mkdir $$backupdir && \ if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ @@ -311,17 +311,17 @@ binutils.info: binutils.texi $(binutils_TEXINFOS) fi; \ rm -rf $$backupdir; exit $$rc -binutils.dvi: binutils.texi $(binutils_TEXINFOS) +binutils.dvi: binutils.texi TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ $(TEXI2DVI) -o $@ `test -f 'binutils.texi' || echo '$(srcdir)/'`binutils.texi -binutils.pdf: binutils.texi $(binutils_TEXINFOS) +binutils.pdf: binutils.texi TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ $(TEXI2PDF) -o $@ `test -f 'binutils.texi' || echo '$(srcdir)/'`binutils.texi -binutils.html: binutils.texi $(binutils_TEXINFOS) +binutils.html: binutils.texi rm -rf $(@:.html=.htp) if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -o $(@:.html=.htp) `test -f 'binutils.texi' || echo '$(srcdir)/'`binutils.texi; \ @@ -570,15 +570,6 @@ uninstall-man: uninstall-man1 uninstall-man uninstall-man1 -config.texi: $(srcdir)/../../bfd/configure $(binutils_TEXI) - rm -f config.texi - eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \ - echo "@set VERSION $$VERSION" > $@ - echo "@set UPDATED `date '+%B %Y'`" >> config.texi - if [ -n "$(REPORT_BUGS_TEXI)" ]; then \ - echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> config.texi; \ - fi - # Man page generation from texinfo addr2line.1: $(binutils_TEXI) $(binutils_TEXINFOS) touch $@ diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi index efa919d..ec69742 100644 --- a/binutils/doc/binutils.texi +++ b/binutils/doc/binutils.texi @@ -4,7 +4,7 @@ @c Free Software Foundation, Inc. @c man begin INCLUDE -@include config.texi +@include bfdver.texi @c man end @ifinfo |