From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 6BC403858C3A for ; Tue, 1 Mar 2022 07:26:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6BC403858C3A 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 F1304342BE0; Tue, 1 Mar 2022 07:26:06 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH] libgloss: rename our $subdirs to $SUBDIRS Date: Tue, 1 Mar 2022 02:26:08 -0500 Message-Id: <20220301072608.1252-1-vapier@gentoo.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: Tue, 01 Mar 2022 07:26:09 -0000 Autoconf defines & uses $subdirs with the AC_CONFIG_SUBDIRS macro. When we add dirs to that ourselves, autoconf will look in and try to run configure scripts if they exist. If they don't (which they shouldn't because we deleted them), autoconf issues a warning about missing configuration information. This is harmless, but can be a bit confusing. Rename our $subdirs to $SUBDIRS to avoid this. --- libgloss/Makefile.am | 3 +- libgloss/Makefile.in | 2 +- libgloss/configure | 91 ++++++++++++++++++++++--------------------- libgloss/configure.ac | 90 +++++++++++++++++++++--------------------- 4 files changed, 96 insertions(+), 90 deletions(-) diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am index 43da838f0f39..216b1e1e90de 100644 --- a/libgloss/Makefile.am +++ b/libgloss/Makefile.am @@ -8,7 +8,8 @@ check_PROGRAMS = info_TEXINFOS = PHONY = -SUBDIRS = @subdirs@ . +## SUBDIRS is our variable while subdirs comes from autoconf. +SUBDIRS = @SUBDIRS@ @subdirs@ . tooldir = $(exec_prefix)/$(target_alias) diff --git a/libgloss/configure.ac b/libgloss/configure.ac index 3d8d2b031d09..58c9b03ca1c1 100644 --- a/libgloss/configure.ac +++ b/libgloss/configure.ac @@ -34,6 +34,7 @@ config_libnosys=true host_makefile_frag=${srcdir}/config/default.mh target_makefile_frag=${srcdir}/config/default.mt +SUBDIRS= case "${target}" in aarch64*-*-*) AC_CONFIG_SUBDIRS(aarch64) @@ -41,78 +42,78 @@ case "${target}" in ;; arc*-*-*) AC_CONFIG_FILES([arc/Makefile]) - subdirs="$subdirs arc" + SUBDIRS="$SUBDIRS arc" ;; csky*-*-*) AC_CONFIG_FILES([csky/Makefile]) - subdirs="$subdirs csky" + SUBDIRS="$SUBDIRS csky" ;; epiphany-*-*) AC_CONFIG_FILES([epiphany/Makefile]) - subdirs="$subdirs epiphany" + SUBDIRS="$SUBDIRS epiphany" config_testsuite=true ;; i[[3456]]86-*-elf* | i[[3456]]86-*-coff*) AC_CONFIG_FILES([i386/Makefile]) - subdirs="$subdirs i386" + SUBDIRS="$SUBDIRS i386" ;; m32r-*-*) AC_CONFIG_FILES([m32r/Makefile]) - subdirs="$subdirs m32r" + SUBDIRS="$SUBDIRS m32r" ;; m68hc11-*-* | m6811-*-* | m68hc12-*-* | m6812-*-*) AC_CONFIG_FILES([m68hc11/Makefile]) - subdirs="$subdirs m68hc11" + SUBDIRS="$SUBDIRS m68hc11" ;; nds32*-*-*) AC_CONFIG_FILES([nds32/Makefile]) - subdirs="$subdirs nds32" + SUBDIRS="$SUBDIRS nds32" ;; fido-*-* | m68*-*-*) AC_CONFIG_FILES([m68k/Makefile]) - subdirs="$subdirs m68k" + SUBDIRS="$SUBDIRS m68k" ;; hppa*-*-pro*) AC_CONFIG_FILES([pa/Makefile]) - subdirs="$subdirs pa" + SUBDIRS="$SUBDIRS pa" ;; i960-*-coff) AC_CONFIG_FILES([i960/Makefile]) - subdirs="$subdirs i960" + SUBDIRS="$SUBDIRS i960" ;; sparc-*leon*-elf* | sparc-*leon*-none*) AC_CONFIG_FILES([sparc_leon/Makefile]) - subdirs="$subdirs sparc_leon" + SUBDIRS="$SUBDIRS sparc_leon" ;; sparclet-*-aout* | sparc-*-elf* | sparc64-*-elf* | sparc86x-*-* | sparclite-*-*) AC_CONFIG_FILES([sparc/Makefile]) - subdirs="$subdirs sparc" + SUBDIRS="$SUBDIRS sparc" ;; sh*-*-pe | mips*-*-pe | *arm*-wince-pe) config_wince=true ;; mips*-*-*) AC_CONFIG_FILES([mips/Makefile]) - subdirs="$subdirs mips" + SUBDIRS="$SUBDIRS mips" target_makefile_frag=${srcdir}/config/mips.mt ;; riscv*-*-*) AC_CONFIG_FILES([riscv/Makefile]) - subdirs="$subdirs riscv" + SUBDIRS="$SUBDIRS riscv" ;; powerpc-*-*|powerpcle-*-*) AC_CONFIG_FILES([rs6000/Makefile]) - subdirs="$subdirs rs6000" + SUBDIRS="$SUBDIRS rs6000" host_makefile_frag=${srcdir}/config/ppc.mh ;; mn10200-*-*) AC_CONFIG_FILES([mn10200/Makefile]) - subdirs="$subdirs mn10200" + SUBDIRS="$SUBDIRS mn10200" target_makefile_frag=${srcdir}/config/mn10200.mt ;; mn10300-*-*) AC_CONFIG_FILES([mn10300/Makefile]) - subdirs="$subdirs mn10300" + SUBDIRS="$SUBDIRS mn10300" target_makefile_frag=${srcdir}/config/mn10300.mt ;; bfin-*-*) @@ -120,103 +121,103 @@ case "${target}" in ;; cr16-*-*) AC_CONFIG_FILES([cr16/Makefile]) - subdirs="$subdirs cr16" + SUBDIRS="$SUBDIRS cr16" ;; cris-*-* | crisv32-*-*) AC_CONFIG_FILES([cris/Makefile]) - subdirs="$subdirs cris" + SUBDIRS="$SUBDIRS cris" ;; crx-*-*) AC_CONFIG_FILES([crx/Makefile]) - subdirs="$subdirs crx" + SUBDIRS="$SUBDIRS crx" ;; d30v-*-*) AC_CONFIG_FILES([d30v/Makefile]) - subdirs="$subdirs d30v" + SUBDIRS="$SUBDIRS d30v" ;; fr30-*-*) AC_CONFIG_FILES([fr30/Makefile]) - subdirs="$subdirs fr30" + SUBDIRS="$SUBDIRS fr30" ;; frv*-*-*) AC_CONFIG_FILES([frv/Makefile]) - subdirs="$subdirs frv" + SUBDIRS="$SUBDIRS frv" ;; ft32*-*-*) AC_CONFIG_FILES([ft32/Makefile]) - subdirs="$subdirs ft32" + SUBDIRS="$SUBDIRS ft32" ;; lm32*-*-*) config_lm32=true ;; mcore-*-*) AC_CONFIG_FILES([mcore/Makefile]) - subdirs="$subdirs mcore" + SUBDIRS="$SUBDIRS mcore" ;; mep-*-*) AC_CONFIG_FILES([mep/Makefile]) - subdirs="$subdirs mep" + SUBDIRS="$SUBDIRS mep" ;; moxie-*-*) AC_CONFIG_FILES([moxie/Makefile]) - subdirs="$subdirs moxie" + SUBDIRS="$SUBDIRS moxie" ;; microblaze*-*-*) AC_CONFIG_FILES([microblaze/Makefile]) - subdirs="$subdirs microblaze" + SUBDIRS="$SUBDIRS microblaze" ;; mt-*-*) AC_CONFIG_FILES([mt/Makefile]) - subdirs="$subdirs mt" + SUBDIRS="$SUBDIRS mt" ;; v850*-*-*) AC_CONFIG_FILES([v850/Makefile]) - subdirs="$subdirs v850" + SUBDIRS="$SUBDIRS v850" ;; visium-*-*) AC_CONFIG_FILES([visium/Makefile]) - subdirs="$subdirs visium" + SUBDIRS="$SUBDIRS visium" config_testsuite=false ;; xc16x-*-*) AC_CONFIG_FILES([xc16x/Makefile]) - subdirs="$subdirs xc16x" + SUBDIRS="$SUBDIRS xc16x" target_makefile_frag=${srcdir}/config/xc16x.mt ;; xstormy16-*-*) AC_CONFIG_FILES([xstormy16/Makefile]) - subdirs="$subdirs xstormy16" + SUBDIRS="$SUBDIRS xstormy16" ;; m32c-*-*) AC_CONFIG_FILES([m32c/Makefile]) - subdirs="$subdirs m32c" + SUBDIRS="$SUBDIRS m32c" ;; msp430-*-elf*) AC_CONFIG_FILES([msp430/Makefile]) - subdirs="$subdirs msp430" + SUBDIRS="$SUBDIRS msp430" config_libnosys=false ;; rl78*-*-elf) AC_CONFIG_FILES([rl78/Makefile]) - subdirs="$subdirs rl78" + SUBDIRS="$SUBDIRS rl78" ;; rx*-*-elf) AC_CONFIG_FILES([rx/Makefile]) - subdirs="$subdirs rx" + SUBDIRS="$SUBDIRS rx" ;; arm*-*-elf | arm*-*-coff | arm*-*-*) AC_CONFIG_SUBDIRS([arm]) ;; spu-*-elf) AC_CONFIG_FILES([spu/Makefile]) - subdirs="$subdirs spu" + SUBDIRS="$SUBDIRS spu" host_makefile_frag=${srcdir}/config/ppc.mh config_testsuite=false config_libnosys=false ;; tic6x-*-*) AC_CONFIG_FILES([tic6x/Makefile]) - subdirs="$subdirs tic6x" + SUBDIRS="$SUBDIRS tic6x" config_testsuite=false ;; iq2000-*-*) @@ -224,17 +225,18 @@ case "${target}" in ;; or1k-*-* | or1knd-*-* ) AC_CONFIG_FILES([or1k/Makefile]) - subdirs="$subdirs or1k" + SUBDIRS="$SUBDIRS or1k" ;; pru-*-*) AC_CONFIG_FILES([pru/Makefile]) - subdirs="$subdirs pru" + SUBDIRS="$SUBDIRS pru" ;; nios2-*-*) AC_CONFIG_FILES([nios2/Makefile]) - subdirs="$subdirs nios2" + SUBDIRS="$SUBDIRS nios2" ;; esac +AC_SUBST(SUBDIRS) dnl These subdirs have converted to non-recursive make. Hopefully someday all dnl the ports above will too! @@ -366,13 +368,13 @@ dnl multilib settings to propagate to all sub-Makefiles that we recurse into dnl too. This can go away if we ever get rid of sub-Makefiles and only use dnl Automake + makefile include fragments. AC_OUTPUT_COMMANDS([ -for subdir in $subdirs; do +for subdir in $SUBDIRS; do case " $CONFIG_FILES " in *" $subdir/Makefile "*) ac_file=$subdir/Makefile . ${multi_basedir}/config-ml.in ;; esac -done], [subdirs="$subdirs"]) +done], [SUBDIRS="$SUBDIRS"]) AM_ENABLE_MULTILIB(, ..) -- 2.34.1