diff options
Diffstat (limited to 'gas/doc')
| -rw-r--r-- | gas/doc/Makefile.am | 20 | ||||
| -rw-r--r-- | gas/doc/Makefile.in | 28 | ||||
| -rw-r--r-- | gas/doc/as.texinfo | 2 |
3 files changed, 19 insertions, 31 deletions
diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am index c830cb3..9616505 100644 --- a/gas/doc/Makefile.am +++ b/gas/doc/Makefile.am @@ -16,10 +16,12 @@ POD2MAN = pod2man --center="GNU Development Tools" \ man_MANS = as.1 info_TEXINFOS = as.texinfo -as_TEXINFOS = asconfig.texi gasver.texi $(CPU_DOCS) +as_TEXINFOS = asconfig.texi $(CPU_DOCS) -AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" -TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" +AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \ + -I ../../bfd/doc +TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \ + -I ../../bfd/doc asconfig.texi: $(CONFIG).texi rm -f asconfig.texi @@ -63,14 +65,6 @@ CPU_DOCS = \ c-z80.texi \ c-z8k.texi -gasver.texi: $(srcdir)/../../bfd/configure - rm -f $@ - eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \ - echo "@set VERSION $$VERSION" > $@ - if [ -n "$(REPORT_BUGS_TEXI)" ]; then \ - echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> $@; \ - fi - # We want install to imply install-info as per GNU standards, despite the # cygnus option. install-data-local: install-info @@ -100,7 +94,7 @@ install-html-am: $(HTMLS) noinst_TEXINFOS = internals.texi -MAINTAINERCLEANFILES = asconfig.texi gasver.texi +MAINTAINERCLEANFILES = asconfig.texi BASEDIR = $(srcdir)/../.. BFDDIR = $(BASEDIR)/bfd @@ -115,7 +109,7 @@ info-local: $(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 asconfig.texi gasver.texi $(CPU_DOCS) +as.1: $(srcdir)/as.texinfo asconfig.texi $(CPU_DOCS) touch $@ -$(TEXI2POD) $(MANCONF) < $(srcdir)/as.texinfo > as.pod -($(POD2MAN) as.pod | \ diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in index 2f1a7b1..ff43d3b 100644 --- a/gas/doc/Makefile.in +++ b/gas/doc/Makefile.in @@ -137,8 +137,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@ @@ -212,9 +210,13 @@ POD2MAN = pod2man --center="GNU Development Tools" \ man_MANS = as.1 info_TEXINFOS = as.texinfo -as_TEXINFOS = asconfig.texi gasver.texi $(CPU_DOCS) -AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" -TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" +as_TEXINFOS = asconfig.texi $(CPU_DOCS) +AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \ + -I ../../bfd/doc + +TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \ + -I ../../bfd/doc + CPU_DOCS = \ c-alpha.texi \ c-arc.texi \ @@ -256,7 +258,7 @@ html__strip_dir = `echo $$p | sed -e 's|^.*/||'`; # This one isn't ready for prime time yet. Not even a little bit. noinst_TEXINFOS = internals.texi -MAINTAINERCLEANFILES = asconfig.texi gasver.texi as.info +MAINTAINERCLEANFILES = asconfig.texi as.info BASEDIR = $(srcdir)/../.. BFDDIR = $(BASEDIR)/bfd CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in @@ -278,9 +280,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 \ @@ -586,14 +588,6 @@ asconfig.texi: $(CONFIG).texi cp $(srcdir)/$(CONFIG).texi ./asconfig.texi chmod u+w ./asconfig.texi -gasver.texi: $(srcdir)/../../bfd/configure - rm -f $@ - eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \ - echo "@set VERSION $$VERSION" > $@ - if [ -n "$(REPORT_BUGS_TEXI)" ]; then \ - echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> $@; \ - fi - # We want install to imply install-info as per GNU standards, despite the # cygnus option. install-data-local: install-info @@ -625,7 +619,7 @@ info-local: $(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 asconfig.texi gasver.texi $(CPU_DOCS) +as.1: $(srcdir)/as.texinfo asconfig.texi $(CPU_DOCS) touch $@ -$(TEXI2POD) $(MANCONF) < $(srcdir)/as.texinfo > as.pod -($(POD2MAN) as.pod | \ diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo index d14eef5..f5332ed 100644 --- a/gas/doc/as.texinfo +++ b/gas/doc/as.texinfo @@ -22,7 +22,7 @@ @c man begin NAME @c --- @include asconfig.texi -@include gasver.texi +@include bfdver.texi @c --- @c man end @c --- |