Wed Jun 5 15:57:28 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
authorroland <roland>
Wed, 5 Jun 1996 23:23:11 +0000 (23:23 +0000)
committerroland <roland>
Wed, 5 Jun 1996 23:23:11 +0000 (23:23 +0000)
* Make-dist (all-headers): Filter $(sysdep_headers) out of $(headers).
(try-sysdeps, +sysdep-names): Check sysdeps/libm-ieee754 too.
* Make-dist [subdirs-dirs]: Don't prefix $(subdir-dirs) with
$(subdir); we are already there.

Make-dist

index 02bffc4..f0c1620 100644 (file)
--- a/Make-dist
+++ b/Make-dist
@@ -48,7 +48,7 @@ endif
 # where source files might be found.
 
 ifdef  subdir
-all-headers = $(headers)
+all-headers = $(filter-out $(sysdep_headers),$(headers))
 else
 +distinfo := $(shell MAKEFLAGS= MFLAGS= $(MAKE) -s no_deps=t \
                     inhibit_interface_rules=t inhibit_mach_syscalls=t \
@@ -67,16 +67,20 @@ foo:=$(shell echo 'IS THIS WORKING??? all-headers=$(all-headers)' >&2)
                  $(filter %.c %.S %.s %.h %.sub,$(distribute))
 foo:=$(shell echo '+maybe-sysdeps=$(+maybe-sysdeps)'>&2)
 # Find all the files that have a stub or generic version.
-try-sysdeps := $(foreach dir,$(..)sysdeps/stub $(..)sysdeps/generic,\
+try-sysdeps := $(foreach dir,$(..)sysdeps/stub $(..)sysdeps/generic \
+                            $(..)sysdeps/libm-ieee754,\
                             $(addprefix $(dir)/,$(+maybe-sysdeps)))
 foo:=$(shell echo 'try-sysdeps=$(try-sysdeps)'>&2)
 +sysdeps := $(wildcard $(try-sysdeps))
 foo:=$(shell echo 'stub/generic +sysdeps=$(+sysdeps)'>&2)
-+sysdep-names := $(sort $(notdir $(+sysdeps)))
++sysdep-names := $(sort $(patsubst $(..)sysdeps/generic/%,%,\
+                                  $(patsubst $(..)sysdeps/stub/%,%,\
+                                  $(patsubst $(..)sysdeps/libm-ieee754/%,%,\
+                                             $(+sysdeps)))))
 foo:=$(shell echo '+sysdep-names=$(+sysdep-names)' >&2)
 
 ifdef subdir-dirs
-vpath % $(addprefix $(subdir)/,$(subdir-dirs))
+vpath % $(subdir-dirs)
 endif
 
 # Now find all the sysdep versions of those files.