On Tue, 30 Apr 2024 at 04:01, Simon Marchi <simon.mar...@polymtl.ca> wrote: > > I get a diff when running "autoreconf" in this directory. I think that > the current state is erroneous: it appears to have been generated using > > aclocal -I ../config -I .. > > even though configure.ac and Makefile.am list the include flag in the > reverse order: > > aclocal -I .. -I ../config > > Running "autoreconf" uses the latter order, so I think that's the > "right" output. > > No functional difference expected.
Thanks, this matches what I noticed. I'm not a maintainer, so I cannot approve, but a minor remark: in GCC we still need a ChangeLog entry in the commit message. Christophe > --- > libgm2/Makefile.in | 10 +++++----- > libgm2/aclocal.m4 | 10 +++++----- > libgm2/libm2cor/Makefile.in | 10 +++++----- > libgm2/libm2iso/Makefile.in | 10 +++++----- > libgm2/libm2log/Makefile.in | 10 +++++----- > libgm2/libm2min/Makefile.in | 10 +++++----- > libgm2/libm2pim/Makefile.in | 10 +++++----- > 7 files changed, 35 insertions(+), 35 deletions(-) > > diff --git a/libgm2/Makefile.in b/libgm2/Makefile.in > index f259df7842cf..9cd79824a53d 100644 > --- a/libgm2/Makefile.in > +++ b/libgm2/Makefile.in > @@ -90,15 +90,15 @@ host_triplet = @host@ > target_triplet = @target@ > subdir = . > ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > -am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ > - $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ > - $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ > - $(top_srcdir)/../config/acx.m4 \ > +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ > $(top_srcdir)/../config/depstand.m4 \ > $(top_srcdir)/../config/lead-dot.m4 \ > $(top_srcdir)/../config/multi.m4 \ > $(top_srcdir)/../config/no-executables.m4 \ > - $(top_srcdir)/../config/override.m4 $(top_srcdir)/acinclude.m4 \ > + $(top_srcdir)/../config/override.m4 \ > + $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ > + $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ > + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ > $(top_srcdir)/../config/gc++filt.m4 \ > $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \ > $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac > diff --git a/libgm2/aclocal.m4 b/libgm2/aclocal.m4 > index bee67b05dee2..19cfb0d1eb26 100644 > --- a/libgm2/aclocal.m4 > +++ b/libgm2/aclocal.m4 > @@ -1187,15 +1187,15 @@ AC_SUBST([am__tar]) > AC_SUBST([am__untar]) > ]) # _AM_PROG_TAR > > -m4_include([../libtool.m4]) > -m4_include([../ltoptions.m4]) > -m4_include([../ltsugar.m4]) > -m4_include([../ltversion.m4]) > -m4_include([../lt~obsolete.m4]) > m4_include([../config/acx.m4]) > m4_include([../config/depstand.m4]) > m4_include([../config/lead-dot.m4]) > m4_include([../config/multi.m4]) > m4_include([../config/no-executables.m4]) > m4_include([../config/override.m4]) > +m4_include([../libtool.m4]) > +m4_include([../ltoptions.m4]) > +m4_include([../ltsugar.m4]) > +m4_include([../ltversion.m4]) > +m4_include([../lt~obsolete.m4]) > m4_include([acinclude.m4]) > diff --git a/libgm2/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in > index 63299388dd8f..f9952cff71a7 100644 > --- a/libgm2/libm2cor/Makefile.in > +++ b/libgm2/libm2cor/Makefile.in > @@ -108,15 +108,15 @@ target_triplet = @target@ > @BUILD_CORLIB_TRUE@@ENABLE_DARWIN_AT_RPATH_TRUE@am__append_1 = > -nodefaultrpaths -Wl,-rpath,@loader_path/ > subdir = libm2cor > ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > -am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ > - $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ > - $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ > - $(top_srcdir)/../config/acx.m4 \ > +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ > $(top_srcdir)/../config/depstand.m4 \ > $(top_srcdir)/../config/lead-dot.m4 \ > $(top_srcdir)/../config/multi.m4 \ > $(top_srcdir)/../config/no-executables.m4 \ > - $(top_srcdir)/../config/override.m4 $(top_srcdir)/acinclude.m4 \ > + $(top_srcdir)/../config/override.m4 \ > + $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ > + $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ > + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ > $(top_srcdir)/../config/gc++filt.m4 \ > $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \ > $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac > diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in > index 964c6da85270..370837f15b82 100644 > --- a/libgm2/libm2iso/Makefile.in > +++ b/libgm2/libm2iso/Makefile.in > @@ -108,15 +108,15 @@ target_triplet = @target@ > @BUILD_ISOLIB_TRUE@@ENABLE_DARWIN_AT_RPATH_TRUE@am__append_1 = > -nodefaultrpaths -Wl,-rpath,@loader_path/ > subdir = libm2iso > ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > -am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ > - $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ > - $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ > - $(top_srcdir)/../config/acx.m4 \ > +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ > $(top_srcdir)/../config/depstand.m4 \ > $(top_srcdir)/../config/lead-dot.m4 \ > $(top_srcdir)/../config/multi.m4 \ > $(top_srcdir)/../config/no-executables.m4 \ > - $(top_srcdir)/../config/override.m4 $(top_srcdir)/acinclude.m4 \ > + $(top_srcdir)/../config/override.m4 \ > + $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ > + $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ > + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ > $(top_srcdir)/../config/gc++filt.m4 \ > $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \ > $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac > diff --git a/libgm2/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in > index bd0f834bdf0b..45260a667e4f 100644 > --- a/libgm2/libm2log/Makefile.in > +++ b/libgm2/libm2log/Makefile.in > @@ -108,15 +108,15 @@ target_triplet = @target@ > @BUILD_LOGLIB_TRUE@@ENABLE_DARWIN_AT_RPATH_TRUE@am__append_1 = > -nodefaultrpaths -Wl,-rpath,@loader_path/ > subdir = libm2log > ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > -am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ > - $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ > - $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ > - $(top_srcdir)/../config/acx.m4 \ > +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ > $(top_srcdir)/../config/depstand.m4 \ > $(top_srcdir)/../config/lead-dot.m4 \ > $(top_srcdir)/../config/multi.m4 \ > $(top_srcdir)/../config/no-executables.m4 \ > - $(top_srcdir)/../config/override.m4 $(top_srcdir)/acinclude.m4 \ > + $(top_srcdir)/../config/override.m4 \ > + $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ > + $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ > + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ > $(top_srcdir)/../config/gc++filt.m4 \ > $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \ > $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac > diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in > index 453a3acf4683..ce0efff26ba1 100644 > --- a/libgm2/libm2min/Makefile.in > +++ b/libgm2/libm2min/Makefile.in > @@ -108,15 +108,15 @@ target_triplet = @target@ > @ENABLE_DARWIN_AT_RPATH_TRUE@am__append_1 = -nodefaultrpaths > -Wl,-rpath,@loader_path/ > subdir = libm2min > ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > -am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ > - $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ > - $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ > - $(top_srcdir)/../config/acx.m4 \ > +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ > $(top_srcdir)/../config/depstand.m4 \ > $(top_srcdir)/../config/lead-dot.m4 \ > $(top_srcdir)/../config/multi.m4 \ > $(top_srcdir)/../config/no-executables.m4 \ > - $(top_srcdir)/../config/override.m4 $(top_srcdir)/acinclude.m4 \ > + $(top_srcdir)/../config/override.m4 \ > + $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ > + $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ > + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ > $(top_srcdir)/../config/gc++filt.m4 \ > $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \ > $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac > diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in > index 85623d0f82f1..67a882e65e7e 100644 > --- a/libgm2/libm2pim/Makefile.in > +++ b/libgm2/libm2pim/Makefile.in > @@ -108,15 +108,15 @@ target_triplet = @target@ > @BUILD_PIMLIB_TRUE@@ENABLE_DARWIN_AT_RPATH_TRUE@am__append_1 = > -nodefaultrpaths -Wl,-rpath,@loader_path/ > subdir = libm2pim > ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > -am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ > - $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ > - $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ > - $(top_srcdir)/../config/acx.m4 \ > +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ > $(top_srcdir)/../config/depstand.m4 \ > $(top_srcdir)/../config/lead-dot.m4 \ > $(top_srcdir)/../config/multi.m4 \ > $(top_srcdir)/../config/no-executables.m4 \ > - $(top_srcdir)/../config/override.m4 $(top_srcdir)/acinclude.m4 \ > + $(top_srcdir)/../config/override.m4 \ > + $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ > + $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ > + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ > $(top_srcdir)/../config/gc++filt.m4 \ > $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \ > $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac > > base-commit: 22b20ac6c6aead2d3f36c413a77dd0b80adfec39 > -- > 2.44.0 >
