[PATCH] gdb/Makefile.in: remove ACLOCAL_AMFLAGS

[PATCH] gdb/Makefile.in: remove ACLOCAL_AMFLAGS

[Simon Marchi]

aclocal picks up the relevant include paths from AC_CONFIG_MACRO_DIRS in
configure.ac, so there's no need to pass `-I ../config` here.

Passing `-I ../config` is actually annoying, because it makes the output
different between when the update is triggered by the maintainer mode
and when aclocal or autoreconf is ran with no special flags.  The
difference in the output is due to the order of include paths being
different.

Change-Id: I2c963876516570842f20b4a6a470867e7a941006
---
 gdb/Makefile.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 0e0f19c40c9f..e83fbc5d146a 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2317,7 +2317,6 @@ config.status: $(srcdir)/configure configure.nat configure.tgt configure.host ..
 	$(SHELL) config.status --recheck
 
 ACLOCAL = aclocal
-ACLOCAL_AMFLAGS = -I ../config
 
 # Keep these in sync with the includes in acinclude.m4.
 aclocal_m4_deps = \
@@ -2345,7 +2344,7 @@ aclocal_m4_deps = \
 	../config/ax_pthread.m4
 
 $(srcdir)/aclocal.m4: @MAINTAINER_MODE_TRUE@ $(aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+	cd $(srcdir) && $(ACLOCAL)
 
 AUTOCONF = autoconf
 configure_deps = $(srcdir)/configure.ac $(srcdir)/aclocal.m4

base-commit: 1320cb92da10d194a5bb0c34ce552dffa52faeb5
-- 
2.44.0

Re: [PATCH] gdb/Makefile.in: remove ACLOCAL_AMFLAGS

[Tom Tromey]

>>>>> "Simon" == Simon Marchi <simon.marchi@efficios.com> writes:

Simon> aclocal picks up the relevant include paths from AC_CONFIG_MACRO_DIRS in
Simon> configure.ac, so there's no need to pass `-I ../config` here.

Simon> Passing `-I ../config` is actually annoying, because it makes the output
Simon> different between when the update is triggered by the maintainer mode
Simon> and when aclocal or autoreconf is ran with no special flags.  The
Simon> difference in the output is due to the order of include paths being
Simon> different.

Thanks.
Approved-By: Tom Tromey <tom@tromey.com>

Tom

Re: [PATCH] gdb/Makefile.in: remove ACLOCAL_AMFLAGS

[Simon Marchi]

On 3/11/24 16:19, Tom Tromey wrote:
>>>>>> "Simon" == Simon Marchi <simon.marchi@efficios.com> writes:
> 
> Simon> aclocal picks up the relevant include paths from AC_CONFIG_MACRO_DIRS in
> Simon> configure.ac, so there's no need to pass `-I ../config` here.
> 
> Simon> Passing `-I ../config` is actually annoying, because it makes the output
> Simon> different between when the update is triggered by the maintainer mode
> Simon> and when aclocal or autoreconf is ran with no special flags.  The
> Simon> difference in the output is due to the order of include paths being
> Simon> different.
> 
> Thanks.
> Approved-By: Tom Tromey <tom@tromey.com>
> 
> Tom

Thanks, pushed.

Simon