newlib: simplify header setup rules

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.

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.
This commit is contained in:
Mike Frysinger 2022-02-19 00:22:14 -05:00
parent 95a28b1f9e
commit ec5ea6efae
2 changed files with 30 additions and 42 deletions

View File

@ -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

View File

@ -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