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 A71413858402 for ; Fri, 25 Feb 2022 00:27:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A71413858402 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 40E19342E63; Fri, 25 Feb 2022 00:27:36 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH] newlib: simplify header setup rules Date: Thu, 24 Feb 2022 19:27:37 -0500 Message-Id: <20220225002737.21507-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.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, 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: Fri, 25 Feb 2022 00:27:38 -0000 --- newlib/Makefile.am | 36 +++++++++++++++--------------------- newlib/Makefile.in | 36 +++++++++++++++--------------------- 2 files changed, 30 insertions(+), 42 deletions(-) diff --git a/newlib/Makefile.am b/newlib/Makefile.am index 9d9fd7048493..b5060fc16109 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -214,39 +214,33 @@ stmp-targ-include: config.status targ-include/bits -$(AM_V_at)if [ -n "$(shared_machine_dir)" ]; then \ for i in $(srcdir)/libc/machine/$(shared_machine_dir)/machine/*.h; do \ - if [ -f $$i ]; then \ - cp $$i targ-include/machine/`basename $$i`; \ - else true; fi ; \ - done; \ + [ -f $$i ] && cp $$i targ-include/machine/; \ + done; \ for i in $(srcdir)/libc/machine/$(shared_machine_dir)/sys/*.h; do \ - if [ -f $$i ]; then \ - cp $$i targ-include/sys/`basename $$i`; \ - else true; fi ; \ - done; \ + [ -f $$i ] && cp $$i targ-include/sys/; \ + done; \ for i in $(srcdir)/libc/machine/$(shared_machine_dir)/include/*.h; do \ - if [ -f $$i ]; then \ - cp $$i targ-include/`basename $$i`; \ - else true; fi ; \ - done; \ + [ -f $$i ] && cp $$i targ-include/; \ + done; \ fi -$(AM_V_at)for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \ if [ -f $$i ]; then \ - cp $$i targ-include/machine/`basename $$i`; \ + cp $$i targ-include/machine/; \ else true; fi ; \ done -$(AM_V_at)for i in $(srcdir)/libc/machine/$(machine_dir)/sys/*.h; do \ if [ -f $$i ]; then \ - cp $$i targ-include/sys/`basename $$i`; \ + cp $$i targ-include/sys/; \ else true; fi ; \ done -$(AM_V_at)for i in $(srcdir)/libc/machine/$(machine_dir)/include/*.h; do \ if [ -f $$i ]; then \ - cp $$i targ-include/`basename $$i`; \ + cp $$i targ-include/; \ else true; fi ; \ done -$(AM_V_at)for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \ if [ -f $$i ]; then \ - cp $$i targ-include/`basename $$i`; \ + cp $$i targ-include/; \ else true; fi ; \ done -$(AM_V_at)for i in $(srcdir)/libc/sys/$(sys_dir)/include/*; do \ @@ -261,27 +255,27 @@ stmp-targ-include: config.status done -$(AM_V_at)for i in $(srcdir)/libc/sys/$(sys_dir)/sys/*.h; do \ if [ -f $$i ]; then \ - cp $$i targ-include/sys/`basename $$i`; \ + cp $$i targ-include/sys/; \ else true; fi ; \ done -$(AM_V_at)for i in $(srcdir)/libc/sys/$(sys_dir)/bits/*.h; do \ if [ -f $$i ]; then \ - cp $$i targ-include/bits/`basename $$i`; \ + cp $$i targ-include/bits/; \ else true; fi ; \ done -$(AM_V_at)for i in $(srcdir)/libc/sys/$(sys_dir)/machine/*.h; do \ if [ -f $$i ]; then \ - cp $$i targ-include/machine/`basename $$i`; \ + cp $$i targ-include/machine/; \ else true; fi ; \ done -$(AM_V_at)for i in $(srcdir)/libc/sys/$(sys_dir)/machine/$(machine_dir)/*.h; do \ if [ -f $$i ]; then \ - cp $$i targ-include/machine/`basename $$i`; \ + cp $$i targ-include/machine/; \ else true; fi ; \ done -$(AM_V_at)for i in $(srcdir)/libc/sys/$(sys_dir)/machine/$(machine_dir)/include/*.h; do \ if [ -f $$i ]; then \ - cp $$i targ-include/machine/`basename $$i`; \ + cp $$i targ-include/machine/; \ else true; fi ; \ done $(AM_V_at)$(MAKE) targ-include/newlib.h -- 2.34.1