Add markers for 2.32 branch to NEWS and ChangeLog files.

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

diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am
index 6fc2b554183438b7c442f5d92f03998841297ae7..c9fd578211b281014d6b12a89ef84c5b3fc6841a 100644 (file)
--- a/bfd/doc/Makefile.am
+++ b/bfd/doc/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to generate Makefile.in
 #
-#   Copyright (C) 2012-2017 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,7 +17,7 @@
 # <http://www.gnu.org/licenses/>.
 #
 
-AUTOMAKE_OPTIONS = 1.9 cygnus
+AUTOMAKE_OPTIONS = info-in-builddir no-texinfo.tex foreign
 
 DOCFILES = aoutx.texi  archive.texi archures.texi \
        bfdt.texi  cache.texi coffcode.texi \
@@ -68,7 +68,7 @@ SRCIPROT = $(srcdir)/../cache.c $(srcdir)/../libbfd.c \
 
 TEXIDIR = $(srcdir)/../../texinfo/fsf
 
-info_TEXINFOS = bfd.texinfo
+info_TEXINFOS = bfd.texi
 bfd_TEXINFOS = $(DOCFILES) bfdsumm.texi
 
 MKDOC = chew$(EXEEXT_FOR_BUILD)
@@ -116,7 +116,7 @@ archures.stamp: $(srcdir)/../archures.c $(srcdir)/doc.str $(MKDOC)
        touch $@
 
 # We use bfdt.texi, rather than bfd.texi, to avoid conflicting with
-# bfd.texinfo on an 8.3 filesystem.
+# bfd.texi on an 8.3 filesystem.
 bfdt.texi: bfdt.stamp ; @true
 bfdt.stamp: $(srcdir)/../bfd.c $(srcdir)/doc.str $(MKDOC)
        ./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../bfd.c >bfd.tmp
@@ -277,6 +277,7 @@ libbfd.h: $(LIBBFD_H_DEP)
        echo "#ifdef __cplusplus" >> $@
        echo "}" >> $@
        echo "#endif" >> $@
+       echo "#endif" >> $@
 
 LIBCOFF_H_DEP = \
        $(srcdir)/../libcoff-in.h       \
@@ -299,6 +300,7 @@ libcoff.h: $(LIBCOFF_H_DEP)
        echo "#ifdef __cplusplus" >> $@
        echo "}" >> $@
        echo "#endif" >> $@
+       echo "#endif" >> $@
 
 BFD_H_DEP = \
        $(srcdir)/../bfd-in.h           \
@@ -366,10 +368,3 @@ MAINTAINERCLEANFILES = $(DOCFILES)
 install: install-info
 
 MAINTAINERCLEANFILES += bfd.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 += bfd.info
-endif