X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fdoc%2FMakefile.am;h=9bd50f4b77a871d167b3ee6bfdfaf72f905ba438;hb=7cac64af7bc6a7f7a86f90a1465f7c3d2b6f07e8;hp=cef2366248d950337216cd7b858f1219620fdef6;hpb=49f58d10f8827774889f6dbc79a934943be8bc44;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am
index cef2366248..9bd50f4b77 100644
--- a/gas/doc/Makefile.am
+++ b/gas/doc/Makefile.am
@@ -1,72 +1,107 @@
 ## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = 1.8 cygnus
+#
+#   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
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+#
+
+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 $(top_srcdir)/../etc/texi2pod.pl
+TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl $(AM_MAKEINFOFLAGS)
 
 POD2MAN = pod2man --center="GNU Development Tools" \
 	--release="binutils-$(VERSION)" --section=1
 
 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" \
+		   -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
-	ln -s $(srcdir)/$(CONFIG).texi ./asconfig.texi >/dev/null 2>&1 \
-	  || ln $(srcdir)/$(CONFIG).texi ./asconfig.texi >/dev/null 2>&1 \
-	  || cp $(srcdir)/$(CONFIG).texi ./asconfig.texi
+	cp $(srcdir)/$(CONFIG).texi ./asconfig.texi
+	chmod u+w ./asconfig.texi
 
 CPU_DOCS = \
-	c-a29k.texi \
+	c-aarch64.texi \
 	c-alpha.texi \
 	c-arc.texi \
 	c-arm.texi \
-	c-d10v.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 \
-	c-h8500.texi \
 	c-hppa.texi \
-	c-i370.texi \
 	c-i386.texi \
-	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-m88k.texi \
+	c-s12z.texi \
+	c-metag.texi \
+	c-microblaze.texi \
 	c-mips.texi \
 	c-mmix.texi \
+	c-mt.texi \
 	c-msp430.texi \
+	c-nios2.texi \
+	c-nds32.texi \
 	c-ns32k.texi \
+	c-or1k.texi \
 	c-pdp11.texi \
 	c-pj.texi \
 	c-ppc.texi \
+	c-pru.texi \
+	c-rl78.texi \
+	c-riscv.texi \
+	c-rx.texi \
+	c-s390.texi \
+	c-score.texi \
 	c-sh.texi \
-	c-sh64.texi \
 	c-sparc.texi \
         c-tic54x.texi \
-	c-vax.texi \
+        c-tic6x.texi \
+	c-tilegx.texi \
+	c-tilepro.texi \
 	c-v850.texi \
+	c-vax.texi \
+	c-visium.texi \
+	c-xgate.texi \
+	c-xstormy16.texi \
 	c-xtensa.texi \
+	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: $(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-data-local: install-info
@@ -75,13 +110,11 @@ install-data-local: install-info
 
 noinst_TEXINFOS = internals.texi
 
-MAINTAINERCLEANFILES = asconfig.texi gasver.texi
+MAINTAINERCLEANFILES = asconfig.texi
 
 BASEDIR = $(srcdir)/../..
 BFDDIR = $(BASEDIR)/bfd
 
-CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in
-
 # Maintenance
 
 # We need it for the taz target in ../../Makefile.in.
@@ -90,11 +123,13 @@ 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.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$$$$ $@) || \
 	        (rm -f $@.T$$$$ && exit 1)
 	rm -f as.pod
+
+MAINTAINERCLEANFILES += as.info