xcoff slurp_armap bounds checking

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

diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am
index 80893581e12f157a78a9db7733767f8415f5967c..9bd50f4b77a871d167b3ee6bfdfaf72f905ba438 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
 #
-#   Copyright (C) 2012-2018 Free Software Foundation, Inc.
+#   Copyright (C) 2012-2019 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,12 +17,12 @@
 # <http://www.gnu.org/licenses/>.
 #
 
-AUTOMAKE_OPTIONS = 1.8 cygnus
+AUTOMAKE_OPTIONS = info-in-builddir no-texinfo.tex foreign
 
 # What version of the manual you want; "all" includes everything
 CONFIG=all
 
-# Options to extract the man page from as.texinfo
+# Options to extract the man page from as.texi
 MANCONF = -Dman
 
 TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl $(AM_MAKEINFOFLAGS)
@@ -32,7 +32,7 @@ POD2MAN = pod2man --center="GNU Development Tools" \
 
 man_MANS = as.1
 
-info_TEXINFOS = as.texinfo
+info_TEXINFOS = as.texi
 as_TEXINFOS = asconfig.texi $(CPU_DOCS)
 
 AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
@@ -52,8 +52,10 @@ CPU_DOCS = \
        c-arm.texi \
        c-avr.texi \
        c-bfin.texi \
+       c-bpf.texi \
        c-cr16.texi \
        c-cris.texi \
+       c-csky.texi \
        c-d10v.texi \
        c-epiphany.texi \
        c-h8300.texi \
@@ -65,6 +67,7 @@ CPU_DOCS = \
        c-m32r.texi \
        c-m68hc11.texi \
        c-m68k.texi \
+       c-s12z.texi \
        c-metag.texi \
        c-microblaze.texi \
        c-mips.texi \
@@ -74,6 +77,7 @@ CPU_DOCS = \
        c-nios2.texi \
        c-nds32.texi \
        c-ns32k.texi \
+       c-or1k.texi \
        c-pdp11.texi \
        c-pj.texi \
        c-ppc.texi \
@@ -119,9 +123,9 @@ 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 $(CPU_DOCS)
+as.1: $(srcdir)/as.texi asconfig.texi $(CPU_DOCS)
        touch $@
-       -$(TEXI2POD) $(MANCONF) < $(srcdir)/as.texinfo > as.pod
+       -$(TEXI2POD) $(MANCONF) < $(srcdir)/as.texi > as.pod
        -($(POD2MAN) as.pod | \
                sed -e '/^.if n .na/d' > $@.T$$$$ && \
                mv -f $@.T$$$$ $@) || \
@@ -129,10 +133,3 @@ as.1: $(srcdir)/as.texinfo asconfig.texi $(CPU_DOCS)
        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