diff mbox

[2/3] Move gdb/warning.m4 to gdbsupport

Message ID 20200210164024.32445-2-simon.marchi@efficios.com
State New
Headers show

Commit Message

Simon Marchi Feb. 10, 2020, 4:40 p.m. UTC
This file is used by gdbsupport, gdbserver and gdb, so I think it
belongs in gdbsupport.  Move it there and update the references the
various acinclude.m4 files.

gdbsupport/ChangeLog:

	* warning.m4: Move here, from gdb/warning.m4.
	* acinclude.m4: Update warning.m4 path.
	* Makefile.in: Re-generate.

gdbserver/ChangeLog:

	* acinclude.m4: Update warning.m4 path.

gdb/ChangeLog:

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

Comments

Tom Tromey Feb. 11, 2020, 2:55 p.m. UTC | #1
>>>>> "Simon" == Simon Marchi <simon.marchi@efficios.com> writes:

Simon> This file is used by gdbsupport, gdbserver and gdb, so I think it
Simon> belongs in gdbsupport.  Move it there and update the references the
Simon> various acinclude.m4 files.

Makes sense to me.

Simon> gdbsupport/ChangeLog:

Simon> 	* warning.m4: Move here, from gdb/warning.m4.
Simon> 	* acinclude.m4: Update warning.m4 path.
Simon> 	* Makefile.in: Re-generate.

Simon> gdbserver/ChangeLog:

Simon> 	* acinclude.m4: Update warning.m4 path.

Simon> gdb/ChangeLog:

Simon> 	* acinclude: Update warning.m4 path.
Simon> 	* warning.m4: Move to gdbsupport.

Looks good.

Tom
diff mbox

Patch

diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
index d60b2fe19c16..14304bbe50ff 100644
--- a/gdb/acinclude.m4
+++ b/gdb/acinclude.m4
@@ -10,7 +10,7 @@  m4_include(acx_configure_dir.m4)
 m4_include(transform.m4)
 
 # This gets AM_GDB_WARNINGS.
-m4_include(warning.m4)
+m4_include(../gdbsupport/warning.m4)
 
 # AM_GDB_UBSAN
 m4_include(sanitize.m4)
diff --git a/gdbserver/acinclude.m4 b/gdbserver/acinclude.m4
index 5a284515c82b..6ed43ddd5219 100644
--- a/gdbserver/acinclude.m4
+++ b/gdbserver/acinclude.m4
@@ -3,8 +3,8 @@  m4_include(../bfd/bfd.m4)
 
 m4_include(../gdb/acx_configure_dir.m4)
 
-# This gets AM_GDB_WARNINGS.
-m4_include(../gdb/warning.m4)
+dnl This gets AM_GDB_WARNINGS.
+m4_include(../gdbsupport/warning.m4)
 
 dnl This gets autoconf bugfixes
 m4_include(../config/override.m4)
diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in
index 91164175bc04..be4d53545311 100644
--- a/gdbsupport/Makefile.in
+++ b/gdbsupport/Makefile.in
@@ -124,7 +124,7 @@  am__aclocal_m4_deps = $(top_srcdir)/../config/codeset.m4 \
 	$(top_srcdir)/../gdb/ax_cxx_compile_stdcxx.m4 \
 	$(top_srcdir)/../gdb/libiberty.m4 \
 	$(top_srcdir)/../gdb/selftest.m4 \
-	$(top_srcdir)/../gdb/ptrace.m4 $(top_srcdir)/../gdb/warning.m4 \
+	$(top_srcdir)/../gdb/ptrace.m4 $(top_srcdir)/warning.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
diff --git a/gdbsupport/acinclude.m4 b/gdbsupport/acinclude.m4
index 3598b201b94b..d638ebcb543a 100644
--- a/gdbsupport/acinclude.m4
+++ b/gdbsupport/acinclude.m4
@@ -7,4 +7,4 @@  m4_include([../gdb/selftest.m4])
 m4_include([../gdb/ptrace.m4])
 
 dnl This gets AM_GDB_WARNINGS.
-m4_include(../gdb/warning.m4)
+m4_include(warning.m4)
diff --git a/gdb/warning.m4 b/gdbsupport/warning.m4
similarity index 100%
rename from gdb/warning.m4
rename to gdbsupport/warning.m4