OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
David Edelsohn 2020-06-22 21:27:18 +00:00
parent 67f6ef3b38
commit 0164e59835
8 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libatomic/Makefile.am
View File

@ -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

4
libatomic/Makefile.in
View File

@ -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

4
libgfortran/Makefile.am
View File

@ -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

4
libgfortran/Makefile.in
View File

@ -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

4
libgomp/Makefile.am
View File

@ -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

4
libgomp/Makefile.in
View File

@ -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

4
libstdc++-v3/Makefile.am
View File

@ -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

4
libstdc++-v3/Makefile.in
View File

@ -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