ChangeLog:

[thirdparty/binutils-gdb.git] / gas / doc / Makefile.am

diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am
index 3b2b38365d49e81364ce67f9a3f3bfd779cb6c7e..cef2366248d950337216cd7b858f1219620fdef6 100644 (file)
--- a/gas/doc/Makefile.am
+++ b/gas/doc/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to generate Makefile.in
 
-AUTOMAKE_OPTIONS = cygnus
+AUTOMAKE_OPTIONS = 1.8 cygnus
 
 # What version of the manual you want; "all" includes everything
 CONFIG=all
@@ -15,7 +15,7 @@ POD2MAN = pod2man --center="GNU Development Tools" \
 
 man_MANS = as.1
 
-info_TEXINFOS = as.texinfo gasp.texi
+info_TEXINFOS = as.texinfo 
 
 asconfig.texi: $(CONFIG).texi
        rm -f asconfig.texi
@@ -25,9 +25,11 @@ asconfig.texi: $(CONFIG).texi
 
 CPU_DOCS = \
        c-a29k.texi \
+       c-alpha.texi \
        c-arc.texi \
        c-arm.texi \
        c-d10v.texi \
+       c-cris.texi \
        c-h8300.texi \
        c-h8500.texi \
        c-hppa.texi \
@@ -35,12 +37,15 @@ CPU_DOCS = \
        c-i386.texi \
        c-i860.texi \
        c-i960.texi \
+       c-ip2k.texi \
+       c-m32c.texi \
        c-m32r.texi \
        c-m68hc11.texi \
        c-m68k.texi \
        c-m88k.texi \
        c-mips.texi \
        c-mmix.texi \
+       c-msp430.texi \
        c-ns32k.texi \
        c-pdp11.texi \
        c-pj.texi \
@@ -51,36 +56,41 @@ CPU_DOCS = \
         c-tic54x.texi \
        c-vax.texi \
        c-v850.texi \
+       c-xtensa.texi \
        c-z8k.texi
 
-gasver.texi: Makefile
+gasver.texi: $(srcdir)/../../bfd/configure
        rm -f $@
-       echo '@set VERSION $(VERSION)' > $@
+       eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \
+         echo "@set VERSION $$VERSION" > $@
 
-as.info: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
+$(srcdir)/as.info: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
 as.dvi: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
 
 # We want install to imply install-info as per GNU standards, despite the
 # cygnus option.
-install: install-info
+install-data-local: install-info
 
 # This one isn't ready for prime time yet.  Not even a little bit.
 
 noinst_TEXINFOS = internals.texi
 
-DISTCLEANFILES = asconfig.texi
+MAINTAINERCLEANFILES = asconfig.texi gasver.texi
 
-MAINTAINERCLEANFILES = gasver.texi
+BASEDIR = $(srcdir)/../..
+BFDDIR = $(BASEDIR)/bfd
+
+CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in
 
 # Maintenance
 
 # We need it for the taz target in ../../Makefile.in.
-info: $(MANS)
+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
+as.1: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
        touch $@
        -$(TEXI2POD) $(MANCONF) < $(srcdir)/as.texinfo > as.pod
        -($(POD2MAN) as.pod | \