[4/4] Move gdb/selftest.m4 to gdbsupport/selftest.m4

Message ID 20200305193011.25939-4-simon.marchi@efficios.com
State Dropped, archived
Headers

Commit Message

Simon Marchi March 5, 2020, 7:30 p.m. UTC
  The selftest.m4 file is used by gdb, gdbserver and gdbsupport, I think
it belongs in gdbsupport.

gdb/ChangeLog:

	* selftest.m4: Move to gdbsupport/.
	* acinclude.m4: Update path to selftest.m4.

gdbserver/ChangeLog:

	* acinclude.m4: Update path to selftest.m4.

gdbsupport/ChangeLog:

	* selftest.m4: Moved from gdb/.
	* acinclude.m4: Update path to selftest.m4.
---
 gdb/acinclude.m4                | 2 +-
 gdbserver/acinclude.m4          | 2 +-
 gdbsupport/Makefile.in          | 3 +--
 gdbsupport/acinclude.m4         | 2 +-
 {gdb => gdbsupport}/selftest.m4 | 0
 5 files changed, 4 insertions(+), 5 deletions(-)
 rename {gdb => gdbsupport}/selftest.m4 (100%)
  

Patch

diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
index 14304bbe50..852a71c3f1 100644
--- a/gdb/acinclude.m4
+++ b/gdb/acinclude.m4
@@ -16,7 +16,7 @@  m4_include(../gdbsupport/warning.m4)
 m4_include(sanitize.m4)
 
 # This gets GDB_AC_SELFTEST.
-m4_include(selftest.m4)
+m4_include(../gdbsupport/selftest.m4)
 
 dnl gdb/configure.in uses BFD_NEED_DECLARATION, so get its definition.
 m4_include(../bfd/bfd.m4)
diff --git a/gdbserver/acinclude.m4 b/gdbserver/acinclude.m4
index 00476bb055..e0d2bfa213 100644
--- a/gdbserver/acinclude.m4
+++ b/gdbserver/acinclude.m4
@@ -32,7 +32,7 @@  m4_include(../gdb/ptrace.m4)
 m4_include(../gdb/ax_cxx_compile_stdcxx.m4)
 
 dnl For GDB_AC_SELFTEST.
-m4_include(../gdb/selftest.m4)
+m4_include(../gdbsupport/selftest.m4)
 
 m4_include([../config/ax_pthread.m4])
 
diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in
index 360ad3fd01..7ed2e6fac2 100644
--- a/gdbsupport/Makefile.in
+++ b/gdbsupport/Makefile.in
@@ -122,8 +122,7 @@  am__aclocal_m4_deps = $(top_srcdir)/../config/codeset.m4 \
 	$(top_srcdir)/../bfd/bfd.m4 $(top_srcdir)/common.m4 \
 	$(top_srcdir)/../config/ax_pthread.m4 \
 	$(top_srcdir)/../gdb/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/../gdb/libiberty.m4 \
-	$(top_srcdir)/../gdb/selftest.m4 \
+	$(top_srcdir)/../gdb/libiberty.m4 $(top_srcdir)/selftest.m4 \
 	$(top_srcdir)/../gdb/ptrace.m4 $(top_srcdir)/warning.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/gdbsupport/acinclude.m4 b/gdbsupport/acinclude.m4
index d638ebcb54..4c86c4f8de 100644
--- a/gdbsupport/acinclude.m4
+++ b/gdbsupport/acinclude.m4
@@ -3,7 +3,7 @@  m4_include([common.m4])
 m4_include([../config/ax_pthread.m4])
 m4_include([../gdb/ax_cxx_compile_stdcxx.m4])
 m4_include([../gdb/libiberty.m4])
-m4_include([../gdb/selftest.m4])
+m4_include([selftest.m4])
 m4_include([../gdb/ptrace.m4])
 
 dnl This gets AM_GDB_WARNINGS.
diff --git a/gdb/selftest.m4 b/gdbsupport/selftest.m4
similarity index 100%
rename from gdb/selftest.m4
rename to gdbsupport/selftest.m4