Patchwork [pushed/gdb-9-branch] libctf: Regenerate Makefile.in and acinclude.m4

login
register
mail settings
Submitter Joel Brobecker
Date Jan. 5, 2020, 6:15 a.m.
Message ID <20200105061517.21874-1-brobecker@adacore.com>
Download mbox | patch
Permalink /patch/37201/
State New
Headers show

Comments

Joel Brobecker - Jan. 5, 2020, 6:15 a.m.
Hello,

I noticed that if I run "autoreconf" with vanilla automake-1.15.1
and autoconf-2.69, I get some differences.

libctf/ChangeLog:

        * Makefile.in, aclocal.m4: Regenerate.

Backported from master, and pushed to gdb-9-branch.

Thanks,

Patch

diff --git a/libctf/ChangeLog b/libctf/ChangeLog
index ea34bae8560..fc36bf2bdc4 100644
--- a/libctf/ChangeLog
+++ b/libctf/ChangeLog
@@ -1,3 +1,7 @@ 
+2020-01-05  Joel Brobecker  <brobecker@adacore.com>
+
+	* Makefile.in, aclocal.m4: Regenerate.
+
 2019-10-16  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* swap.h (bswap_16, bswap_32, bswap_64): Make static.
diff --git a/libctf/Makefile.in b/libctf/Makefile.in
index d6e73cac732..cfcac9536f4 100644
--- a/libctf/Makefile.in
+++ b/libctf/Makefile.in
@@ -110,13 +110,13 @@  host_triplet = @host@
 @NEED_CTF_QSORT_R_TRUE@am__append_1 = ctf-qsort_r.c
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \
+	$(top_srcdir)/../config/acx.m4 \
 	$(top_srcdir)/../config/depstand.m4 \
 	$(top_srcdir)/../config/lead-dot.m4 \
 	$(top_srcdir)/../config/override.m4 \
 	$(top_srcdir)/../config/warnings.m4 \
-	$(top_srcdir)/../config/zlib.m4 \
-	$(top_srcdir)/../bfd/acinclude.m4 $(top_srcdir)/../libtool.m4 \
+	$(top_srcdir)/../config/zlib.m4 $(top_srcdir)/../libtool.m4 \
 	$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
 	$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
 	$(top_srcdir)/configure.ac
diff --git a/libctf/aclocal.m4 b/libctf/aclocal.m4
index 04583b42f02..15d96cd63e3 100644
--- a/libctf/aclocal.m4
+++ b/libctf/aclocal.m4
@@ -1227,13 +1227,13 @@  AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../bfd/acinclude.m4])
 m4_include([../config/acx.m4])
 m4_include([../config/depstand.m4])
 m4_include([../config/lead-dot.m4])
 m4_include([../config/override.m4])
 m4_include([../config/warnings.m4])
 m4_include([../config/zlib.m4])
-m4_include([../bfd/acinclude.m4])
 m4_include([../libtool.m4])
 m4_include([../ltoptions.m4])
 m4_include([../ltsugar.m4])