From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id 242BB3858D20 for ; Fri, 14 Apr 2023 12:49:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 242BB3858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wr1-x435.google.com with SMTP id r20so1576978wra.5 for ; Fri, 14 Apr 2023 05:49:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681476563; x=1684068563; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=+52reS35ZzMSbapsLuZFseZIdMgTvA/X7UrqA510+lY=; b=h7xAHiBgag67mR2m4zhpsNCqKUDf4P3/+8QowPPNpxGNIEaZTAZ/NzraLI0QHTtCmx 0HaF03F4KHksZOScCQ47+ty3PpHT4ytHfiM+HPjkoW3WvT85KbTylDUSEXzVBiPYMksI aHqIZbXh1n5u6D/w6yDViI7fAmKCvESgLBzlUSIVNCEJ0OEcSQ1jlGjR2Tnpu7nsEree aGIqPMaO6h6wklDz4y9S6MNUezQ5dYbpXOSIgmaXDcDDS+lwN+4Uhy+q8T8HAkms/d4g tzBjJjPd0KKsfqih37LoqUATovY+KDkgrdttjuEbbQ5CNZn8uEnl2Io7PJ4MHsZCuHCA BkAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681476563; x=1684068563; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+52reS35ZzMSbapsLuZFseZIdMgTvA/X7UrqA510+lY=; b=fiRhllrpv+wZwh0PKgsyVNOlhZz2SeSmPt5UHCbGbPaDzLe2xrKrFnJAIOLVvh/0Yf XYyqkFzPAde/UEeEhbA+s3scLiemhCZF8Yd6N+BfEsYMiDs5XafaN6sRSgr7oPap0I83 4yK33MUeAzR8ftmHmaT3hlxPQ7+pspe7VUpDKGku1HYX0rptLuP+GHA9uGR4vuBy5rcV bbyq1fJJ3EXxPhLP2gz6Tl53D/lHhwec+//cOvgIhS4MJzCPCv0C50biIPVmd9C7f8ho L5HTYgd4X4K+ANmPEaXwSjb+78sD0GfJsATpMCbT3pZx39VWFXYnU7jRrGjhUgDqDlR0 DiQw== X-Gm-Message-State: AAQBX9exKreKnPR4v+AWbUbupYNhsEI+cEyCajvXlEUsdE4uSJIdEej0 rkmAJApy6qN6aQcBywoJ3mA= X-Google-Smtp-Source: AKy350YOSzsmySVx9zK+Ta9nRik+f/yRRbCBUwRjn+3hvyxyZvvUD9jrQs5wzIpgqZ3NIht4/2R3Ow== X-Received: by 2002:a5d:494a:0:b0:2f6:620f:92b8 with SMTP id r10-20020a5d494a000000b002f6620f92b8mr2885650wrs.35.1681476562597; Fri, 14 Apr 2023 05:49:22 -0700 (PDT) Received: from lancelot ([82.153.103.125]) by smtp.gmail.com with ESMTPSA id p13-20020a5d4e0d000000b002f4cf72fce6sm3514505wrt.46.2023.04.14.05.49.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 05:49:21 -0700 (PDT) Received: from gaius by lancelot with local (Exim 4.94.2) (envelope-from ) id 1pnIrg-00BVU5-7k; Fri, 14 Apr 2023 13:49:20 +0100 From: Gaius Mulley To: Thomas Schwinge Cc: Subject: Re: libgm2: Adjust 'autogen.sh' to 'ACLOCAL_AMFLAGS', and simplify References: <87cz4aqj2k.fsf@dirichlet.schwinge.homeip.net> Date: Fri, 14 Apr 2023 13:49:20 +0100 In-Reply-To: <87cz4aqj2k.fsf@dirichlet.schwinge.homeip.net> (Thomas Schwinge's message of "Tue, 11 Apr 2023 22:07:15 +0200") Message-ID: <87edomeii7.fsf@debian> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Thomas Schwinge writes: > Hi! > > On 2022-12-06T14:47:26+0000, Gaius Mulley via Gcc-patches wrote: >> This patch set consists of the libgm2 makefile, autoconf sources >> necessary to build the libm2pim, libm2iso, libm2min, libm2cor >> and libm2log. > > Notice: > >> --- /dev/null 2022-08-24 16:22:16.888000070 +0100 >> +++ gcc-git-devel-modula2/libgm2/Makefile.am 2022-12-06 02:56:51.428775= 868 +0000 > >> +ACLOCAL_AMFLAGS =3D -I . -I .. -I ../config > > ... this vs.: > >> --- /dev/null 2022-08-24 16:22:16.888000070 +0100 >> +++ gcc-git-devel-modula2/libgm2/autogen.sh 2022-12-06 02:56:51.432775= 922 +0000 > >> +aclocal -I . -I ../config >> +autoreconf -I . -I ../config > > ... this: for the latter, no explicit '-I ..' before '-I ../config'. > This means that 'autogen.sh' vs. plain 'autoreconf' don't produce > identical results: different order of files found via search paths. > OK to align (and simplify) that as per the attached > "libgm2: Adjust 'autogen.sh' to 'ACLOCAL_AMFLAGS', and simplify"? Hi Thomas, thanks for detecting the bug and the patch - yes looks good to me - feel free to apply. > Separately, given that plain 'autoreconf' works, why have 'autogen.sh' at > all? If autoreconf does the same as autogen.sh then yes this can be removed (or its contents replaced with a call to autoreconf perhaps?), regards, Gaius > > > Gr=C3=BC=C3=9Fe > Thomas > > > ----------------- > Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstra=C3=9Fe > 201, 80634 M=C3=BCnchen; Gesellschaft mit beschr=C3=A4nkter Haftung; > Gesch=C3=A4ftsf=C3=BChrer: Thomas Heurung, Frank Th=C3=BCrauf; Sitz der G= esellschaft: > M=C3=BCnchen; Registergericht M=C3=BCnchen, HRB 106955 > >>>From 8fd7ff138c83200ab83df7f08f773e33961550b4 Mon Sep 17 00:00:00 2001 > From: Thomas Schwinge > Date: Tue, 11 Apr 2023 21:40:14 +0200 > Subject: [PATCH] libgm2: Adjust 'autogen.sh' to 'ACLOCAL_AMFLAGS', and > simplify > > Specifying explicit '-I ..' before '-I ../config' is what (most) other GCC > components do. Specifying '-I .' is not necessary. > > With the order of '-I's aligned, 'autogen.sh' and plain 'autoreconf' then > produce identical results. > > libgm2/ > * autogen.sh: For 'aclocal', 'autoreconf', remove '-I .', > add '-I ..'. > * Makefile.am (ACLOCAL_AMFLAGS): Remove '-I .'. > * libm2cor/Makefile.am (ACLOCAL_AMFLAGS): Likewise. > * libm2iso/Makefile.am (ACLOCAL_AMFLAGS): Likewise. > * libm2log/Makefile.am (ACLOCAL_AMFLAGS): Likewise. > * libm2min/Makefile.am (ACLOCAL_AMFLAGS): Likewise. > * libm2pim/Makefile.am (ACLOCAL_AMFLAGS): Likewise. > * aclocal.m4: Regenerate. > * Makefile.in: Likewise. > * libm2cor/Makefile.in: Likewise. > * libm2iso/Makefile.in: Likewise. > * libm2log/Makefile.in: Likewise. > * libm2min/Makefile.in: Likewise. > * libm2pim/Makefile.in: Likewise. > --- > libgm2/Makefile.am | 2 +- > libgm2/Makefile.in | 12 ++++++------ > libgm2/aclocal.m4 | 10 +++++----- > libgm2/autogen.sh | 5 ++--- > libgm2/libm2cor/Makefile.am | 2 +- > libgm2/libm2cor/Makefile.in | 12 ++++++------ > libgm2/libm2iso/Makefile.am | 2 +- > libgm2/libm2iso/Makefile.in | 12 ++++++------ > libgm2/libm2log/Makefile.am | 2 +- > libgm2/libm2log/Makefile.in | 12 ++++++------ > libgm2/libm2min/Makefile.am | 2 +- > libgm2/libm2min/Makefile.in | 12 ++++++------ > libgm2/libm2pim/Makefile.am | 2 +- > libgm2/libm2pim/Makefile.in | 12 ++++++------ > 14 files changed, 49 insertions(+), 50 deletions(-) > > diff --git a/libgm2/Makefile.am b/libgm2/Makefile.am > index 0b593f6ff216..95df3ed7a301 100644 > --- a/libgm2/Makefile.am > +++ b/libgm2/Makefile.am > @@ -25,7 +25,7 @@ AUTOMAKE_OPTIONS =3D 1.8 foreign >=20=20 > SUFFIXES =3D .c .mod .def .o .obj .lo .a >=20=20 > -ACLOCAL_AMFLAGS =3D -I . -I .. -I ../config > +ACLOCAL_AMFLAGS =3D -I .. -I ../config >=20=20 > # Multilib support. > MAKEOVERRIDES=3D > diff --git a/libgm2/Makefile.in b/libgm2/Makefile.in > index da2ec7c2a098..d9950065de19 100644 > --- a/libgm2/Makefile.in > +++ b/libgm2/Makefile.in > @@ -90,15 +90,15 @@ host_triplet =3D @host@ > target_triplet =3D @target@ > subdir =3D . > ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 > -am__aclocal_m4_deps =3D $(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 =3D $(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)/configure.ac > + $(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)/configure.ac > am__configure_deps =3D $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ > $(ACLOCAL_M4) > DIST_COMMON =3D $(srcdir)/Makefile.am $(top_srcdir)/configure \ > @@ -332,7 +332,7 @@ top_srcdir =3D @top_srcdir@ > # Modula-2 support. > AUTOMAKE_OPTIONS =3D 1.8 foreign > SUFFIXES =3D .c .mod .def .o .obj .lo .a > -ACLOCAL_AMFLAGS =3D -I . -I .. -I ../config > +ACLOCAL_AMFLAGS =3D -I .. -I ../config >=20=20 > # Multilib support. > MAKEOVERRIDES =3D=20 > diff --git a/libgm2/aclocal.m4 b/libgm2/aclocal.m4 > index c352303012d2..832065fbb9be 100644 > --- a/libgm2/aclocal.m4 > +++ b/libgm2/aclocal.m4 > @@ -1187,14 +1187,14 @@ AC_SUBST([am__tar]) > AC_SUBST([am__untar]) > ]) # _AM_PROG_TAR >=20=20 > -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]) > diff --git a/libgm2/autogen.sh b/libgm2/autogen.sh > index ea0ef7660984..1b144970a570 100755 > --- a/libgm2/autogen.sh > +++ b/libgm2/autogen.sh > @@ -21,9 +21,8 @@ rm -rf autom4te.cache >=20=20 > # libtoolize > rm -f aclocal.m4 > -# aclocal -I . -I config -I ../config > -aclocal -I . -I ../config > -autoreconf -I . -I ../config > +aclocal -I .. -I ../config > +autoreconf -I .. -I ../config > automake --include-deps >=20=20 > rm -rf autom4te.cache > diff --git a/libgm2/libm2cor/Makefile.am b/libgm2/libm2cor/Makefile.am > index 8e68272aaecf..48de40c22dd1 100644 > --- a/libgm2/libm2cor/Makefile.am > +++ b/libgm2/libm2cor/Makefile.am > @@ -17,7 +17,7 @@ >=20=20 > SUFFIXES =3D .c .cc .mod .def .o .obj .lo .a .la >=20=20 > -ACLOCAL_AMFLAGS =3D -I . -I .. -I ../config > +ACLOCAL_AMFLAGS =3D -I .. -I ../config >=20=20 > VPATH =3D . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs-coroutines >=20=20 > diff --git a/libgm2/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in > index f92dd941eb0f..9d643d5f8f66 100644 > --- a/libgm2/libm2cor/Makefile.in > +++ b/libgm2/libm2cor/Makefile.in > @@ -107,15 +107,15 @@ host_triplet =3D @host@ > target_triplet =3D @target@ > subdir =3D libm2cor > ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 > -am__aclocal_m4_deps =3D $(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 =3D $(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)/configure.ac > + $(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)/configure.ac > am__configure_deps =3D $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ > $(ACLOCAL_M4) > DIST_COMMON =3D $(srcdir)/Makefile.am > @@ -384,7 +384,7 @@ top_build_prefix =3D @top_build_prefix@ > top_builddir =3D @top_builddir@ > top_srcdir =3D @top_srcdir@ > SUFFIXES =3D .c .cc .mod .def .o .obj .lo .a .la > -ACLOCAL_AMFLAGS =3D -I . -I .. -I ../config > +ACLOCAL_AMFLAGS =3D -I .. -I ../config >=20=20 > # Multilib support. > MAKEOVERRIDES =3D=20 > diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am > index dddced4b8af1..d48ef0692ab4 100644 > --- a/libgm2/libm2iso/Makefile.am > +++ b/libgm2/libm2iso/Makefile.am > @@ -17,7 +17,7 @@ >=20=20 > SUFFIXES =3D .c .cc .mod .def .o .obj .lo .a .la >=20=20 > -ACLOCAL_AMFLAGS =3D -I . -I .. -I ../config > +ACLOCAL_AMFLAGS =3D -I .. -I ../config >=20=20 > VPATH =3D . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs-iso >=20=20 > diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in > index e28e9dd29787..b8936e745fef 100644 > --- a/libgm2/libm2iso/Makefile.in > +++ b/libgm2/libm2iso/Makefile.in > @@ -107,15 +107,15 @@ host_triplet =3D @host@ > target_triplet =3D @target@ > subdir =3D libm2iso > ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 > -am__aclocal_m4_deps =3D $(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 =3D $(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)/configure.ac > + $(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)/configure.ac > am__configure_deps =3D $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ > $(ACLOCAL_M4) > DIST_COMMON =3D $(srcdir)/Makefile.am > @@ -409,7 +409,7 @@ top_build_prefix =3D @top_build_prefix@ > top_builddir =3D @top_builddir@ > top_srcdir =3D @top_srcdir@ > SUFFIXES =3D .c .cc .mod .def .o .obj .lo .a .la > -ACLOCAL_AMFLAGS =3D -I . -I .. -I ../config > +ACLOCAL_AMFLAGS =3D -I .. -I ../config >=20=20 > # Multilib support. > MAKEOVERRIDES =3D=20 > diff --git a/libgm2/libm2log/Makefile.am b/libgm2/libm2log/Makefile.am > index c38ec3cda56f..a15747fd2453 100644 > --- a/libgm2/libm2log/Makefile.am > +++ b/libgm2/libm2log/Makefile.am > @@ -17,7 +17,7 @@ >=20=20 > SUFFIXES =3D .c .mod .def .o .obj .lo .a .la >=20=20 > -ACLOCAL_AMFLAGS =3D -I . -I .. -I ../config > +ACLOCAL_AMFLAGS =3D -I .. -I ../config >=20=20 > VPATH =3D . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs-log >=20=20 > diff --git a/libgm2/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in > index ef43b0dc49f1..fa98b1d8ff1d 100644 > --- a/libgm2/libm2log/Makefile.in > +++ b/libgm2/libm2log/Makefile.in > @@ -107,15 +107,15 @@ host_triplet =3D @host@ > target_triplet =3D @target@ > subdir =3D libm2log > ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 > -am__aclocal_m4_deps =3D $(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 =3D $(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)/configure.ac > + $(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)/configure.ac > am__configure_deps =3D $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ > $(ACLOCAL_M4) > DIST_COMMON =3D $(srcdir)/Makefile.am > @@ -373,7 +373,7 @@ top_build_prefix =3D @top_build_prefix@ > top_builddir =3D @top_builddir@ > top_srcdir =3D @top_srcdir@ > SUFFIXES =3D .c .mod .def .o .obj .lo .a .la > -ACLOCAL_AMFLAGS =3D -I . -I .. -I ../config > +ACLOCAL_AMFLAGS =3D -I .. -I ../config >=20=20 > # Multilib support. > MAKEOVERRIDES =3D=20 > diff --git a/libgm2/libm2min/Makefile.am b/libgm2/libm2min/Makefile.am > index 4d6203a69e32..1ff160028f64 100644 > --- a/libgm2/libm2min/Makefile.am > +++ b/libgm2/libm2min/Makefile.am > @@ -17,7 +17,7 @@ >=20=20 > SUFFIXES =3D .c .mod .def .o .obj .lo .a .la >=20=20 > -ACLOCAL_AMFLAGS =3D -I . -I .. -I ../config > +ACLOCAL_AMFLAGS =3D -I .. -I ../config >=20=20 > VPATH =3D . @srcdir@/../../gcc/m2/gm2-libs-min >=20=20 > diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in > index 673d6d59d942..1c0bebdc3044 100644 > --- a/libgm2/libm2min/Makefile.in > +++ b/libgm2/libm2min/Makefile.in > @@ -107,15 +107,15 @@ host_triplet =3D @host@ > target_triplet =3D @target@ > subdir =3D libm2min > ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 > -am__aclocal_m4_deps =3D $(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 =3D $(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)/configure.ac > + $(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)/configure.ac > am__configure_deps =3D $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ > $(ACLOCAL_M4) > DIST_COMMON =3D $(srcdir)/Makefile.am > @@ -363,7 +363,7 @@ top_build_prefix =3D @top_build_prefix@ > top_builddir =3D @top_builddir@ > top_srcdir =3D @top_srcdir@ > SUFFIXES =3D .c .mod .def .o .obj .lo .a .la > -ACLOCAL_AMFLAGS =3D -I . -I .. -I ../config > +ACLOCAL_AMFLAGS =3D -I .. -I ../config >=20=20 > # Multilib support. > MAKEOVERRIDES =3D=20 > diff --git a/libgm2/libm2pim/Makefile.am b/libgm2/libm2pim/Makefile.am > index 53042681a74c..ebfeba1ac1df 100644 > --- a/libgm2/libm2pim/Makefile.am > +++ b/libgm2/libm2pim/Makefile.am > @@ -17,7 +17,7 @@ >=20=20 > SUFFIXES =3D .c .mod .def .o .obj .lo .a .la >=20=20 > -ACLOCAL_AMFLAGS =3D -I . -I .. -I ../config > +ACLOCAL_AMFLAGS =3D -I .. -I ../config >=20=20 > VPATH =3D . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs >=20=20 > diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in > index b77a628715c9..e5a97976d932 100644 > --- a/libgm2/libm2pim/Makefile.in > +++ b/libgm2/libm2pim/Makefile.in > @@ -107,15 +107,15 @@ host_triplet =3D @host@ > target_triplet =3D @target@ > subdir =3D libm2pim > ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 > -am__aclocal_m4_deps =3D $(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 =3D $(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)/configure.ac > + $(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)/configure.ac > am__configure_deps =3D $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ > $(ACLOCAL_M4) > DIST_COMMON =3D $(srcdir)/Makefile.am > @@ -398,7 +398,7 @@ top_build_prefix =3D @top_build_prefix@ > top_builddir =3D @top_builddir@ > top_srcdir =3D @top_srcdir@ > SUFFIXES =3D .c .mod .def .o .obj .lo .a .la > -ACLOCAL_AMFLAGS =3D -I . -I .. -I ../config > +ACLOCAL_AMFLAGS =3D -I .. -I ../config >=20=20 > # Multilib support. > MAKEOVERRIDES =3D=20