Mon Jun 17 19:09:49 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>

* Make-dist (+sysdeps): Move wildcard inside loop to avoid consing
	up a huge list just to discard most of it.

	* configure.in (sysnames): Avoid fgrep by using the case shell
	builtin.

	* Makeconfig (config.status): Fix dependency on Implies files.
This commit is contained in:
Roland McGrath 1996-06-19 14:52:21 +00:00
parent a1470b6f83
commit e50ec9f91d
4 changed files with 18 additions and 9 deletions

View File

@ -1,3 +1,13 @@
Mon Jun 17 19:09:49 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Make-dist (+sysdeps): Move wildcard inside loop to avoid consing
up a huge list just to discard most of it.
* configure.in (sysnames): Avoid fgrep by using the case shell
builtin.
* Makeconfig (config.status): Fix dependency on Implies files.
Wed Jun 19 01:27:57 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> Wed Jun 19 01:27:57 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* math/Makefile (distribute): Add ieee-math.c. * math/Makefile (distribute): Add ieee-math.c.

View File

@ -93,8 +93,8 @@ vpath % $(subdir-dirs)
endif endif
# Now find all the sysdep versions of those files. # Now find all the sysdep versions of those files.
+sysdeps := $(wildcard $(foreach dir,$(sysdep_dirs) $(source_dirs),\ +sysdeps := $(foreach dir,$(sysdep_dirs) $(source_dirs),\
$(addprefix $(dir)/, \ $(wildcard $(addprefix $(dir)/, \
$(+sysdep-names) \ $(+sysdep-names) \
$(+sysdep-names:.c=.s) \ $(+sysdep-names:.c=.s) \
$(+sysdep-names:.c=.S) \ $(+sysdep-names:.c=.S) \

View File

@ -94,9 +94,11 @@ $(common-objpfx)config.make: $(common-objpfx)config.status $(..)config.h.in
# configure when any of them changes. # configure when any of them changes.
$(common-objpfx)config.status: $(..)configure \ $(common-objpfx)config.status: $(..)configure \
$(foreach dir,$(config-sysdirs),\ $(foreach dir,$(config-sysdirs),\
$(wildcard \
$(sysdep_dir)/$(dir)/Implies) \
$(patsubst %.in,%,\ $(patsubst %.in,%,\
$(firstword $(wildcard \ $(firstword $(wildcard \
$(addprefix $(sysdep_dir)/$(dir)/,configure configure.in Implies))))) $(addprefix $(sysdep_dir)/$(dir)/,configure configure.in)))))
@cd $(@D); if test -f $(@F); then exec $(SHELL) $(@F) --recheck; else \ @cd $(@D); if test -f $(@F); then exec $(SHELL) $(@F) --recheck; else \
echo The GNU C library has not been configured. >&2; \ echo The GNU C library has not been configured. >&2; \
echo Run \`configure\' to configure it before building. >&2; \ echo Run \`configure\' to configure it before building. >&2; \

View File

@ -233,15 +233,15 @@ sysnames="`echo $sysnames | sed -e 's@^/@@' -e 's@ /@ @g'`"
# Expand the list of system names into a full list of directories # Expand the list of system names into a full list of directories
# from each element's parent name and Implies file (if present). # from each element's parent name and Implies file (if present).
set $sysnames set $sysnames
names= seen= names=
while test $# -gt 0; do while test $# -gt 0; do
name=$1 name=$1
shift shift
if echo "$seen" | fgrep -x $name >/dev/null; then case " $names " in *" $name "*)
# Already in the list. # Already in the list.
continue continue
fi esac
# Report each name as we discover it, so there is no long pause in output. # Report each name as we discover it, so there is no long pause in output.
echo $ac_n "$name $ac_c" >&AC_FD_MSG echo $ac_n "$name $ac_c" >&AC_FD_MSG
@ -260,9 +260,6 @@ while test $# -gt 0; do
# Add NAME to the list of names. # Add NAME to the list of names.
names="$names $name" names="$names $name"
# We maintain a parallel newline-separated list for the fgrep check above.
seen="$seen
$name"
# Find the parent of NAME, using the empty string if it has none. # Find the parent of NAME, using the empty string if it has none.
changequote(,)dnl changequote(,)dnl