From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 13B643858416 for ; Mon, 17 Jan 2022 19:02:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 13B643858416 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org Received: by smtp.gentoo.org (Postfix, from userid 559) id A481A34308D; Mon, 17 Jan 2022 19:02:39 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH] newlib: enable automake subdir-objects in all dirs Date: Mon, 17 Jan 2022 14:02:38 -0500 Message-Id: <20220117190238.28483-1-vapier@gentoo.org> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jan 2022 19:02:41 -0000 Currently this is only enabled in the top-level as that's the only place where it seemed to be used. But the libc/sys/phoenix/ dir also uses this functionality, but fails to explicitly enable it. Automake workedaround it, but generated warnings. Move the option to NEWLIB_CONFIGURE so all dirs get it automatically iff they end up using the option. If they don't use the option, there's no difference to the generated code. --- newlib/Makefile.am | 2 +- newlib/Makefile.in | 2 +- newlib/acinclude.m4 | 2 +- newlib/libc/sys/phoenix/Makefile.in | 242 ++++++++++++++++------------ 4 files changed, 141 insertions(+), 107 deletions(-) diff --git a/newlib/Makefile.am b/newlib/Makefile.am index b2d363863380..6a28215d3620 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to generate Makefile.in -AUTOMAKE_OPTIONS = dejagnu subdir-objects +AUTOMAKE_OPTIONS = dejagnu ACLOCAL_AMFLAGS = -I . -I .. -I ../config # Variables that will accumulate in subdirs. diff --git a/newlib/acinclude.m4 b/newlib/acinclude.m4 index 2500ba6df17c..bdefd963542a 100644 --- a/newlib/acinclude.m4 +++ b/newlib/acinclude.m4 @@ -120,7 +120,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE([foreign no-installinfo no-dependencies no-dist no-define 1.15.1]) +AM_INIT_AUTOMAKE([foreign no-installinfo no-dependencies no-dist no-define subdir-objects 1.15.1]) AM_MAINTAINER_MODE() AM_SILENT_RULES(yes) -- 2.33.0