Cleanups after the update to Autoconf 2.64, Automake 1.11.

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

diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am
index 99e8390bc4144ea224dfb357edb4f7aedcaf8f7e..e00243c4c6795075af2866459325793e8f4ea80e 100644 (file)
--- a/gas/doc/Makefile.am
+++ b/gas/doc/Makefile.am
@@ -16,8 +16,12 @@ POD2MAN = pod2man --center="GNU Development Tools" \
 man_MANS = as.1
 
 info_TEXINFOS = as.texinfo 
+as_TEXINFOS = asconfig.texi $(CPU_DOCS)
 
-AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty"
+AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
+                  -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
+TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
+                  -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
 
 asconfig.texi: $(CONFIG).texi
        rm -f asconfig.texi
@@ -28,7 +32,9 @@ CPU_DOCS = \
        c-alpha.texi \
        c-arc.texi \
        c-arm.texi \
+       c-avr.texi \
        c-bfin.texi \
+       c-cr16.texi \
        c-d10v.texi \
        c-cris.texi \
        c-h8300.texi \
@@ -38,10 +44,12 @@ CPU_DOCS = \
        c-i860.texi \
        c-i960.texi \
        c-ip2k.texi \
+       c-lm32.texi \
        c-m32c.texi \
        c-m32r.texi \
        c-m68hc11.texi \
        c-m68k.texi \
+       c-microblaze.texi \
        c-mips.texi \
        c-mmix.texi \
        c-mt.texi \
@@ -50,6 +58,8 @@ CPU_DOCS = \
        c-pdp11.texi \
        c-pj.texi \
        c-ppc.texi \
+       c-s390.texi \
+       c-score.texi \
        c-sh.texi \
        c-sh64.texi \
        c-sparc.texi \
@@ -60,43 +70,15 @@ 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" > $@
-
-$(srcdir)/as.info as.dvi as.html: $(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-data-local: install-info
 
-html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-
-install-html: install-html-am
-
-install-html-am: $(HTMLS)
-       @$(NORMAL_INSTALL)
-       test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
-       @list='$(HTMLS)'; for p in $$list; do \
-         if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \
-         f=$(html__strip_dir) \
-         if test -d "$$d$$p"; then \
-           echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
-           $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-           echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-           $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
-         else \
-           echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
-           $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
-         fi; \
-       done
-
 # This one isn't ready for prime time yet.  Not even a little bit.
 
 noinst_TEXINFOS = internals.texi
 
-MAINTAINERCLEANFILES = asconfig.texi gasver.texi
+MAINTAINERCLEANFILES = asconfig.texi
 
 BASEDIR = $(srcdir)/../..
 BFDDIR = $(BASEDIR)/bfd
@@ -111,7 +93,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 | \
@@ -119,3 +101,12 @@ as.1: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
                mv -f $@.T$$$$ $@) || \
                (rm -f $@.T$$$$ && exit 1)
        rm -f as.pod
+
+MAINTAINERCLEANFILES += as.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,
+# though, so we use a bogus condition.
+if GENINSRC_NEVER
+DISTCLEANFILES = as.info
+endif