diff options
author | Mike Frysinger <vapier@gentoo.org> | 2023-01-02 19:30:22 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2023-01-02 19:30:22 -0500 |
commit | 4d4996a55e68390666cba64b641b3e1b9be131fd (patch) | |
tree | a10c8808424489796315ab3ab4bb04d8d19e5f41 | |
parent | eb9afa636211003eb6910a2f10e4f9af88dc5c77 (diff) | |
download | gdb-4d4996a55e68390666cba64b641b3e1b9be131fd.zip gdb-4d4996a55e68390666cba64b641b3e1b9be131fd.tar.gz gdb-4d4996a55e68390666cba64b641b3e1b9be131fd.tar.bz2 |
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.
-rw-r--r-- | sim/Makefile.am | 2 | ||||
-rw-r--r-- | sim/Makefile.in | 3 | ||||
-rwxr-xr-x | sim/configure | 8 | ||||
-rw-r--r-- | sim/configure.ac | 5 |
4 files changed, 4 insertions, 14 deletions
diff --git a/sim/Makefile.am b/sim/Makefile.am index 4f74a71..eb891a5 100644 --- 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 e5d12f6..b6aa1a7 100644 --- 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 053830c..e2ff1be 100755 --- 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 af7e6e7..8a2082f 100644 --- 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 |