From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 421183858D20; Tue, 1 Mar 2022 00:03:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 421183858D20 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: simplify header setup rules X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 95a28b1f9ed78a873b4bc30e1ffc39ddb23a13a3 X-Git-Newrev: ec5ea6efaebae94f0b37d88b6f1cdc5d24ef878a Message-Id: <20220301000359.421183858D20@sourceware.org> Date: Tue, 1 Mar 2022 00:03:59 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2022 00:03:59 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Dec5ea6efaeb= ae94f0b37d88b6f1cdc5d24ef878a commit ec5ea6efaebae94f0b37d88b6f1cdc5d24ef878a Author: Mike Frysinger Date: Sat Feb 19 00:22:14 2022 -0500 newlib: simplify header setup rules =20 Since POSIX cp requires copying a file to a directory without having to specify the name explicitly, rely on that to avoid calling basename on every source file. =20 We can also drop the stub `true` call if the -f test failed. The use of `if` already takes care of that in POSIX shell. Diff: --- 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 ad69e95fb..6ee0adf04 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -211,39 +211,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 \ @@ -258,27 +252,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 diff --git a/newlib/Makefile.in b/newlib/Makefile.in index 1491aa1c3..6213d6328 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -8738,39 +8738,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 \ @@ -8785,27 +8779,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