build: Use -include instead of conditional include.

Automake and GNU Make both use the endif keyword, which conflicts and
elicits an error for matching if/ifdef and endif.

This patch changes the conditional include to use "-include" to prevent
a warning about a possible empty tmake_file.

libgomp/ChangeLog

2020-06-22  David Edelsohn  <dje.gcc@gmail.com>

	* Makefile.am: Use -include.
	* Makefile.in: Regenerate.

libatomic/ChangeLog

2020-06-22  David Edelsohn  <dje.gcc@gmail.com>

	* Makefile.am: Use -include.
	* Makefile.in: Regenerate.

libstdc++-v3/ChangeLog

2020-06-22  David Edelsohn  <dje.gcc@gmail.com>

	* Makefile.am: Use -include.
	* Makefile.in: Regenerate.

libgfortran/ChangeLog

2020-06-22  David Edelsohn  <dje.gcc@gmail.com>

	* Makefile.am: Use -include.
	* Makefile.in: Regenerate.

diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am
index f169d505227c23355ddf76c82172b2f846edb324..f540d59992b9b6b666ba31e1ca818f536d80b54e 100644 (file)
--- a/libatomic/Makefile.am
+++ b/libatomic/Makefile.am
@@ -154,8 +154,6 @@ all-multi: $(libatomic_la_LIBADD)
        $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
 
 # target overrides
-ifneq ($(tmake_file),)
-include $(tmake_file)
-endif
+-include $(tmake_file)
 
 include $(top_srcdir)/../multilib.am

diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in
index e8d47f28364f679492417bab13bb1d88e0288d04..0a51bd55f01fee1419722ace0d24d17b90a39fbf 100644 (file)
--- a/libatomic/Makefile.in
+++ b/libatomic/Makefile.in
@@ -864,9 +864,7 @@ all-multi: $(libatomic_la_LIBADD)
        $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
 
 # target overrides
-ifneq ($(tmake_file),)
-include $(tmake_file)
-endif
+-include $(tmake_file)
 
 # GNU Make needs to see an explicit $(MAKE) variable in the command it
 # runs to enable its job server during parallel builds.  Hence the

diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am
index 69e94eea550ca97925d850eabbe1b415c506e05c..36b204e1aa31dcd8a47cb3a4b61f4ec48ce13d9f 100644 (file)
--- a/libgfortran/Makefile.am
+++ b/libgfortran/Makefile.am
@@ -1237,8 +1237,6 @@ endif
 EXTRA_DIST = $(m4_files)
 
 # target overrides
-ifneq ($(tmake_file),)
-include $(tmake_file)
-endif
+-include $(tmake_file)
 
 include $(top_srcdir)/../multilib.am

diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in
index 1de35db54beb667d476be44c815ad473b606864c..fe063e7ff91ed061b8be1d6e0eb75aa7535770e5 100644 (file)
--- a/libgfortran/Makefile.in
+++ b/libgfortran/Makefile.in
@@ -7192,9 +7192,7 @@ fpu-target.inc: fpu-target.h $(srcdir)/libgfortran.h
 @MAINTAINER_MODE_TRUE@ $(M4) -Dfile=$@ -I$(srcdir)/m4 misc_specifics.m4 > $@
 
 # target overrides
-ifneq ($(tmake_file),)
-include $(tmake_file)
-endif
+-include $(tmake_file)
 
 # GNU Make needs to see an explicit $(MAKE) variable in the command it
 # runs to enable its job server during parallel builds.  Hence the

diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am
index 16b6995694969e7fcdd6f23fcde47282fa67f3a9..586c930a4d7a98faa81ad1260ff03ac553069317 100644 (file)
--- a/libgomp/Makefile.am
+++ b/libgomp/Makefile.am
@@ -142,8 +142,6 @@ CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO)
 MAINTAINERCLEANFILES = $(srcdir)/libgomp.info
 
 # target overrides
-ifneq ($(tmake_file),)
-include $(tmake_file)
-endif
+-include $(tmake_file)
 
 include $(top_srcdir)/../multilib.am

diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in
index 5455951cdedc3adecb389fcd065f922fa9f493c6..b570a942cff5ca73204dc1463b4568c6d76ffdad 100644 (file)
--- a/libgomp/Makefile.in
+++ b/libgomp/Makefile.in
@@ -1440,9 +1440,7 @@ stamp-build-info: libgomp.texi
        @touch $@
 
 # target overrides
-ifneq ($(tmake_file),)
-include $(tmake_file)
-endif
+-include $(tmake_file)
 
 # GNU Make needs to see an explicit $(MAKE) variable in the command it
 # runs to enable its job server during parallel builds.  Hence the

diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am
index 62c2c324082885a88b7dc8c85b8c220c9e899c06..f11a13d274d5afe24e825ec24cc8a74f813e1c23 100644 (file)
--- a/libstdc++-v3/Makefile.am
+++ b/libstdc++-v3/Makefile.am
@@ -174,8 +174,6 @@ AM_MAKEFLAGS = \
 FLAGS_TO_PASS = $(AM_MAKEFLAGS)
 
 # target overrides
-ifneq ($(tmake_file),)
-include $(tmake_file)
-endif
+-include $(tmake_file)
 
 include $(top_srcdir)/../multilib.am

diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index e8987d45916e69cbd6989282a8aaa713080f0c42..f52872487708ab0fb61b8420e7d29aaa2e54fe7d 100644 (file)
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -819,9 +819,7 @@ install-dvi:
 TAGS: tags-recursive $(LISP)
 
 # target overrides
-ifneq ($(tmake_file),)
-include $(tmake_file)
-endif
+-include $(tmake_file)
 
 # GNU Make needs to see an explicit $(MAKE) variable in the command it
 # runs to enable its job server during parallel builds.  Hence the