[binutils-gdb] gdb/Makefile.in: remove ACLOCAL_AMFLAGS

Simon Marchi simark@sourceware.org
Mon Mar 11 21:02:33 GMT 2024


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=0824937af0c0822e629a7076c3f5dd39df3b16be

commit 0824937af0c0822e629a7076c3f5dd39df3b16be
Author: Simon Marchi <simon.marchi@efficios.com>
Date:   Mon Mar 11 15:32:40 2024 -0400

    gdb/Makefile.in: remove ACLOCAL_AMFLAGS
    
    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
    Approved-By: Tom Tromey <tom@tromey.com>

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

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 0e0f19c40c9..e83fbc5d146 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


More information about the Gdb-cvs mailing list