From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 51CEC3858D32 for ; Tue, 3 Jan 2023 00:31:22 +0000 (GMT) Received: by smtp.gentoo.org (Postfix, from userid 559) id 0F755340CAC; Tue, 3 Jan 2023 00:31:21 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: build: use Automake include vars Date: Mon, 2 Jan 2023 19:31:15 -0500 Message-Id: <20230103003115.21756-1-vapier@gentoo.org> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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. --- sim/Makefile.am | 2 +- sim/Makefile.in | 3 +-- sim/configure | 8 ++------ sim/configure.ac | 5 ----- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/sim/Makefile.am b/sim/Makefile.am index 4f74a716ffe8..eb891a56f2d5 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 e5d12f66e77a..b6aa1a7a1c95 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 053830c9c193..e2ff1bea4402 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 af7e6e752ca1..8a2082f0a4dc 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 -- 2.39.0