sim: build: use Automake include vars

Rather than define our own hack for emitting an include statement,
use the existing Automake include variables.  These have the nice
side-effect of being more portable.

diff --git a/sim/Makefile.am b/sim/Makefile.am
index 4f74a716ffe86707da80e47c153b8e9e667d4727..eb891a56f2d5b4bc2ef2d8aa648da2f8e0b8b5ba 100644 (file)
--- a/sim/Makefile.am
+++ b/sim/Makefile.am
@@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = dejagnu foreign no-dist subdir-objects
 ACLOCAL_AMFLAGS = -Im4 -I.. -I../config
 
 GNULIB_PARENT_DIR = ..
-@include_makefile@ $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc
+@am__include@ @am__quote@$(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc@am__quote@
 
 srccom = $(srcdir)/common
 srcroot = $(srcdir)/..

diff --git a/sim/Makefile.in b/sim/Makefile.in
index e5d12f66e77a6218b551e049993dc54f49267fbe..b6aa1a7a1c95b09fd3cd6638f75b3fc85c136af0 100644 (file)
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -1177,7 +1177,6 @@ host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_makefile = @include_makefile@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -3253,7 +3252,7 @@ uninstall-am: uninstall-armdocDATA uninstall-dtbDATA \
 
 .PRECIOUS: Makefile
 
-@include_makefile@ $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc
+@am__include@ @am__quote@$(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc@am__quote@
 
 # Generate target constants for newlib/libgloss from its source tree.
 # This file is shipped with distributions so we build in the source dir.

diff --git a/sim/configure b/sim/configure
index 053830c9c1938060e202f2c9441030009b106a1f..e2ff1bea440224e9e153ff6d360eb3deee0d1608 100755 (executable)
--- a/sim/configure
+++ b/sim/configure
@@ -638,7 +638,6 @@ enable_option_checking=no
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
-include_makefile
 SIM_RX_CYCLE_ACCURATE_FLAGS
 SIM_RISCV_BITSIZE
 SIM_MIPS_GEN_MODE_MULTI_FALSE
@@ -12450,7 +12449,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12453 "configure"
+#line 12452 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12556,7 +12555,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12559 "configure"
+#line 12558 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16681,9 +16680,6 @@ fi
 
 
 
-include_makefile="include"
-
-
 ac_config_files="$ac_config_files arch-subdir.mk Makefile .gdbinit:gdbinit.in"
 
 cat >confcache <<\_ACEOF

diff --git a/sim/configure.ac b/sim/configure.ac
index af7e6e752ca1f16a1d3a2ce0fa00a5e4683bfb8c..8a2082f0a4dc06a5ba379931b8c8bfe79730816a 100644 (file)
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -208,10 +208,5 @@ m4_include([mips/acinclude.m4])
 m4_include([riscv/acinclude.m4])
 m4_include([rx/acinclude.m4])
 
-dnl Hack to output an "include" statement in the Makefile so automake doesn't
-dnl try to follow it itself while processing Makefile.am.
-include_makefile="include"
-AC_SUBST(include_makefile)
-
 AC_CONFIG_FILES([arch-subdir.mk Makefile .gdbinit:gdbinit.in])
 AC_OUTPUT