From patchwork Tue Apr 11 20:07:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 82166 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2826658vqo; Tue, 11 Apr 2023 13:08:08 -0700 (PDT) X-Google-Smtp-Source: AKy350Z4upQVVFSGZ+dH1gl/8FItKsFQlxUXTNGPlsaiRYlBuncbg/fE8DTRO2hCqMEkyz28T+xI X-Received: by 2002:a17:906:4793:b0:93e:5a85:ad3c with SMTP id cw19-20020a170906479300b0093e5a85ad3cmr14534486ejc.57.1681243688153; Tue, 11 Apr 2023 13:08:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681243688; cv=none; d=google.com; s=arc-20160816; b=x1/C3U7k6KJSwnq2FXShwKpxgeb77jhkkKxWvgBavAADdzcArOrf21vRp3/KbcByiu 19KhFhTvPo/EKLtcqC84RZCaxJb2VDbubX6+Gf+WtjtoLig5HTzNKe7uKC071Y4X2zsK 429yLtHpG8oDMnIhRLAjqnIqZi0u7Ycpl/eML2t337tOwNzbEcVBq/IVDXHfljT9mnB/ 5LCGwxw4ApJpWbGrcF88IVneUcg6fbnEvRyxB7ChnybFXWy2keVJQrmhPBeiF0a4xG/e OWskhGyMDHeRJVx6EnjdhdXs/81AdCoQWNMmbKIgJ2CMSg2pSUZyGifkT6ZcEaJECYQE hO2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version:message-id:date :user-agent:references:in-reply-to:subject:to:from:ironport-sdr :dmarc-filter:delivered-to; bh=f9ZjDP++SoD6igtHDTdN3gIeLBv2HfuUnizlsl3StGc=; b=wrRTcX3V323/ldynU3Wsn+ASJszUmLEHeIrUZdAORpdkYp1fiWyiHbJqZC4N323+ju AHc3qCGE+9pdOKxUQHkYQKMObDeRhBvEuNS0n+fHfGJ/UTogp0R/ZagjAJDFzamczN+x mtgYv7Fd6dBTWQ+6Doi7XUE8z7PYO5Zt1VRfb8F6lnJiZr2iTUAS/e537vStCzQS7ajc TEFArqvFc0/ML0xWVM0HM2Q8wDvfApmJIOT90qu1ityxME7VSGOEnSmQUai3uVrMJjTl TZOW7nHplAxWya9ix/+vrwftH76nriCr74CYwXoNg5vm5p7fN9UgbYwNBF+/hTH0h+BF lSFQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id nb35-20020a1709071ca300b0094e51f1f8c1si138925ejc.686.2023.04.11.13.08.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 13:08:08 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4177D3857709 for ; Tue, 11 Apr 2023 20:07:55 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id 311033858D28 for ; Tue, 11 Apr 2023 20:07:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 311033858D28 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.98,336,1673942400"; d="scan'208,223";a="2395106" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 11 Apr 2023 12:07:27 -0800 IronPort-SDR: vfqjXOW1llf7JrnJlnAFoVNwxQ38TiuXqI5lO+QeXZDtC6kxSFXoi+UbVMxcoORj/YowsJ+gGj FsyD65pC/byb2O3ezpjgt/E4lsV2nbpwTsssUjT5NmeA6suml6pZVz1GRKhb9SoAoPM7kVNqBO p/mjZRFd3Bs4EAIaeD+VZ0iEx5nHH/Ai9BASlX+yNKpa/sNbJANwPUpiVu9ntjUKSc0Vhv5heL A3OAiRIRr7ZJYKN7iyust9su+KVMMiEzCoPcc89wStLDGfSGM7vngsOG1RCg8tGp83UqQXwhjg TMc= From: Thomas Schwinge To: Gaius Mulley , Subject: libgm2: Adjust 'autogen.sh' to 'ACLOCAL_AMFLAGS', and simplify (was: [PATCH v3 8/19] modula2 front end: libgm2 contents) In-Reply-To: References: User-Agent: Notmuch/0.29.1+93~g67ed7df (https://notmuchmail.org) Emacs/27.1 (i686-pc-linux-gnu) Date: Tue, 11 Apr 2023 22:07:15 +0200 Message-ID: <87cz4aqj2k.fsf@dirichlet.schwinge.homeip.net> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-14.mgc.mentorg.com (139.181.222.14) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762911781470334214?= X-GMAIL-MSGID: =?utf-8?q?1762911781470334214?= 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.428775868 +0000 > +ACLOCAL_AMFLAGS = -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.432775922 +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"? Separately, given that plain 'autoreconf' works, why have 'autogen.sh' at all? Grüße Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, 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 = 1.8 foreign SUFFIXES = .c .mod .def .o .obj .lo .a -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config # Multilib support. MAKEOVERRIDES= 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 = @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)/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 = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ @@ -332,7 +332,7 @@ top_srcdir = @top_srcdir@ # Modula-2 support. AUTOMAKE_OPTIONS = 1.8 foreign SUFFIXES = .c .mod .def .o .obj .lo .a -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config # Multilib support. MAKEOVERRIDES = 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 -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 # 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 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 @@ SUFFIXES = .c .cc .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config VPATH = . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs-coroutines 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 = @host@ target_triplet = @target@ 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)/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 = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am @@ -384,7 +384,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUFFIXES = .c .cc .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config # Multilib support. MAKEOVERRIDES = 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 @@ SUFFIXES = .c .cc .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config VPATH = . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs-iso 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 = @host@ target_triplet = @target@ 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)/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 = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am @@ -409,7 +409,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUFFIXES = .c .cc .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config # Multilib support. MAKEOVERRIDES = 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 @@ SUFFIXES = .c .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config VPATH = . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs-log 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 = @host@ target_triplet = @target@ 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)/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 = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am @@ -373,7 +373,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUFFIXES = .c .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config # Multilib support. MAKEOVERRIDES = 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 @@ SUFFIXES = .c .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config VPATH = . @srcdir@/../../gcc/m2/gm2-libs-min 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 = @host@ target_triplet = @target@ 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)/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 = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am @@ -363,7 +363,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUFFIXES = .c .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config # Multilib support. MAKEOVERRIDES = 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 @@ SUFFIXES = .c .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config VPATH = . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs 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 = @host@ target_triplet = @target@ 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)/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 = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am @@ -398,7 +398,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUFFIXES = .c .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config # Multilib support. MAKEOVERRIDES = -- 2.39.2