X-Git-Url: http://git.csclub.uwaterloo.ca/?p=kopensolaris-gnu%2Fglibc.git;a=blobdiff_plain;f=Make-dist;h=7d8131a798a67381d81992f730ef0349e2051937;hp=4a342c7f9bf944c6bc9ac23b3f5b963c5f9872b5;hb=3674a2f294ce528c6b1c2e280519c9cdd3c8d094;hpb=560a6fbe556a5dcc97de1611405fe7dab592dc7d diff --git a/Make-dist b/Make-dist index 4a342c7f9b..7d8131a798 100644 --- a/Make-dist +++ b/Make-dist @@ -61,18 +61,23 @@ try-sysdeps := $(foreach dir,$(..)sysdeps/stub $(..)sysdeps/generic,\ foo:=$(shell echo 'try-sysdeps=$(try-sysdeps)'>&2) +sysdeps := $(wildcard $(try-sysdeps)) foo:=$(shell echo 'stub/generic +sysdeps=$(+sysdeps)'>&2) -+sysdeps := $(notdir $(+sysdeps)) # Get just the file names. ++sysdep-names := $(sort $(notdir $(+sysdeps))) +foo:=$(shell echo '+sysdep-names=$(+sysdep-names)' >&2) + # Now find all the sysdep versions of those files. +sysdeps := $(wildcard $(foreach dir,$(sysdep_dirs) $(source_dirs),\ - $(addprefix $(dir)/,$(+sysdeps)))) + $(addprefix $(dir)/, \ + $(+sysdep-names) \ + $(+sysdep-names:.c=.s) \ + $(+sysdep-names:.c=.S) \ + ))) + # Source and header files to go in the distribution tar file. .S.s := $(wildcard $(sources:.c=.S) $(sources:.c=.s)) sources := $(filter-out $(addsuffix .c,$(basename $(.S.s))),$(sources)) $(.S.s) -+sysdep-names := $(sort $(notdir $(+sysdeps))) -foo:=$(shell echo '+sysdep-names=$(+sysdep-names)' >&2) +out := $(patsubst %.S,%.c,$(+sysdep-names:.s=.c)) \ $(addsuffix .c,$(sysdep_routines)) \ $(+subdir-nodist) @@ -99,6 +104,9 @@ $(..)glibc-%: +tsrcs := $(+tsrcs) \ TAGS +.PHONY: TAGS +TAGS: $(..)MakeTAGS + $(MAKE) -f $< $@ -o subdir_TAGS ifdef subdir @@ -155,8 +163,9 @@ $(tardir).tar.Z: dist.tar.Z $(tardir)-crypt.tar.Z: crypt/crypt.tar.Z ln $< $@ -crypt/%: +crypt/%: FORCE $(MAKE) -C $(@D) $(@F) +FORCE: dist.tar: $(tardir) $(+tsrcs) tar ch$(verbose)f $@ $(addprefix $(tardir)/,$(filter-out $(tardir),$^)) @@ -166,15 +175,6 @@ de-..: dist.tar tar cf $< -C /tmp $(tardir) -rm -fr /tmp/$(tardir) & -README: README.template version.c - -rm -f $@ - sed -e 's/RELEASE/$(release)/' -e 's/VERSION/$(version)/' < $< > $@ -# Make it unwritable so I won't change it by mistake. - chmod 444 $@ - -INSTALL: manual/maint.texinfo - makeinfo +no-validate +no-warn +no-headers $< - %.Z: % compress -c $< > $@