X-Git-Url: http://git.csclub.uwaterloo.ca/?p=kopensolaris-gnu%2Fglibc.git;a=blobdiff_plain;f=Make-dist;h=e7ef2fba84c4d49b5d7ea36c923e20fda7a29f36;hp=7f340019c85a055f6edcc655f49799b0d360aab2;hb=0d96fc6478a87c17b5c7397bf6bfd7551afaf2c3;hpb=d9f7f1aee8e32ef98cab3c090211f08ec1e03d85

diff --git a/Make-dist b/Make-dist
index 7f340019c8..e7ef2fba84 100644
--- a/Make-dist
+++ b/Make-dist
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -26,34 +26,37 @@ endif
 
 include $(..)Makeconfig
 
-foo:=$(shell echo first generated='$(generated)' >&2)
-ifdef objpfx
-generated := $(foreach file,$(filter $(objpfx)%,$(generated)),\
-		       $(file:$(objpfx)%=%) $(file)) \
-	     $(filter-out $(objpfx)%,$(generated))
-foo:=$(shell echo generated='$(generated)' >&2)
-endif
-
 foo:=$(shell echo 'distribute=$(distribute)'>&2)
 foo:=$(shell echo 'foobar=$(filter %.c %.S %.s %.h,$(distribute))'>&2)
 
 ifndef sysdep_dirs
 # Find all sysdep directories.
-export sysdep_dirs := $(shell find $(..)sysdeps -type d -print)
+export sysdep_dirs := $(shell find $(..)sysdeps -type d ! -name RCS -print)
 else
 # Defined by the parent.
 sysdep_dirs := $(addprefix $(..),$(sysdep_dirs))
 endif
 
+sysdep-Subdir-files := $(wildcard $(addsuffix /Subdirs,$(sysdep_dirs)))
+ifdef sysdep-Subdir-files
+subdirs := $(sort $(subdirs) \
+		  $(shell sed -e 's/\#.*$$//' $(sysdep-Subdir-files)))
+endif
+
+
 # Makefiles can define `source_dirs' to list nonstandard directories
 # where source files might be found.
 
 ifdef	subdir
 all-headers = $(headers)
 else
-+distinfo := $(shell MAKEFLAGS= MFLAGS= $(MAKE) -s no_deps=t echo-distinfo \
-		     | grep -v '^make')
++distinfo := $(shell MAKEFLAGS= MFLAGS= $(MAKE) -s no_deps=t \
+		     inhibit_interface_rules=t inhibit_mach_syscalls=t \
+		     subdirs='$(subdirs)' echo-distinfo | grep -v '^make')
+foo:=$(shell echo>&2 '+distinfo=$(+distinfo)')
 all-headers := $(patsubst +header+%,%,$(filter +header+%,$(+distinfo)))
+# Ignore subdir headers without top-level indirections.
+all-headers := $(sort $(headers) $(wildcard $(all-headers)))
 +subdir-nodist := $(patsubst +nodist+%,%,$(filter +nodist+%,$(+distinfo)))
 +subdir-headers := $(filter-out $(headers),$(all-headers))
 endif
@@ -61,7 +64,7 @@ foo:=$(shell echo 'IS THIS WORKING??? all-headers=$(all-headers)' >&2)
 
 # Find all sysdep sources and headers.
 +maybe-sysdeps := $(sources) $(sources:.c=.s) $(sources:.c=.S) $(all-headers) \
-		  $(filter %.c %.S %.s %.h,$(distribute))
+		  $(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,\
@@ -95,6 +98,8 @@ sources := $(filter-out $(addsuffix .c,$(basename $(.S.s))),$(sources)) $(.S.s)
 	   $(+sysdeps)
 foo:=$(shell echo made +tsrcs >&2)
 foo:=$(shell echo generated='$(generated)' >&2)
+generated := $(sort $(generated) $(generated:.S=.c) $(generated:.s=.c))
+foo:=$(shell echo now generated='$(generated)' >&2)
 +tsrcs := $(sort $(filter-out $(generated),$(+tsrcs)))
 foo:=$(shell echo '+tsrcs=$(+tsrcs)'>&2)
 foo:=$(shell echo foobie, dammit! >&2)
@@ -108,7 +113,7 @@ version := $(word 2,$(rel+vers))
 export tardir := glibc-$(version)
 endif
 
-$(..)$(tardir):
+$(..)glibc-$(version):
 	ln -s . $@
 
 +tsrcs := $(+tsrcs) \
@@ -143,12 +148,9 @@ else	# Parent makefile.
 foo:=$(shell echo parent foobie>&2)
 +sysdep-distfiles := $(wildcard $(addsuffix /Dist,$(sysdep_dirs)))
 foo:=$(shell echo +sysdep-distfiles='$(+sysdep-distfiles)'>&2)
-sysdep-Subdir-files := $(wildcard $(addsuffix /Subdirs,$(sysdep_dirs)))
-ifdef sysdep-Subdir-files
-subdirs := $(sort $(subdirs) $(shell cat $(sysdep-Subdir-files)))
-endif
 +sysdep-dist := $(foreach file,$(+sysdep-distfiles),\
-			  $(addprefix $(dir $(file)),$(shell cat $(file)))) \
+			  $(addprefix $(dir $(file)), \
+				      $(shell sed -e 's/\#.*$$//' $(file)))) \
 		$(+sysdep-distfiles) \
 		$(sysdep-Subdir-files)
 foo:=$(shell echo '+sysdep-dist=$(+sysdep-dist)' >&2)
@@ -162,14 +164,19 @@ subdirs := $(filter-out crypt,$(subdirs))
 
 +tsrcs := $(+tsrcs) $(+sysdep-tsrcs)
 
-%/configure: %/configure.in
-	autoconf $(ACFLAGS) $< > $@.new
-	mv $@.new $@
+define autoconf-it
+autoconf $(ACFLAGS) $< > $@.new
+mv -f $@.new $@
+test ! -d CVS || cvs commit -m'Regenerated: autoconf $(ACFLAGS) $<' $@
+endef
+
+configure: configure.in; $(autoconf-it)
+%/configure: %/configure.in; $(autoconf-it)
 
 .PHONY: dist
-dist: $(tardir).tar.z $(tardir)-crypt.tar.z
+dist: $(tardir).tar.gz $(tardir)-crypt.tar.gz
 
-$(tardir)-crypt.tar.z: crypt/crypt.tar.z
+$(tardir)-crypt.tar.gz: crypt/crypt.tar.gz
 	ln $< $@
 crypt/%: FORCE
 	$(MAKE) -C $(@D) $(@F)
@@ -177,21 +184,20 @@ FORCE:
 
 subdir_dist: dist.tar
 dist.tar: $(tardir) $(+tsrcs)
-	tar ch$(verbose)f $@ \
-			  $(addprefix $(tardir)/,$(filter-out $(tardir),$^))
+	tar chvf $@ $(addprefix $(tardir)/,$(filter-out $(tardir),$^))
 
 $(tardir).tar: dist.tar subdir_dist
-	tar xf $< -C /tmp
+	tar xfv $< -C /tmp | doschk
 	tar covf $@ -C /tmp $(tardir)
 	-rm -fr /tmp/$(tardir) &
 
 %.Z: %
 	compress -c $< > $@
 
-%.z: %
-	gzip -9 -c $< > $@
+%.gz: %
+	gzip -9 -v -c $< > $@
 
-foo:=$(shell echo 'subdirs=$(subdirs)' >&2)
+foo:=$(shell echo subdirs=$(subdirs) >&2)
 dist-subdirs := $(addprefix dist-,$(subdirs)) # dist-manual
 .PHONY: subdir_dist $(dist-subdirs)
 subdir_dist: $(dist-subdirs)
@@ -204,9 +210,15 @@ README: README.template version.c
 	sed -e 's/RELEASE/$(release)/' -e 's/VERSION/$(version)/' < $< > $@
 # Make it unwritable so I won't change it by mistake.
 	chmod 444 $@
+	test ! -d CVS || commit -m'Remade for $(release)-$(version)' $@
 
 
 endif	# Subdirectory vs. parent makefile
 
 # Get these things out of the environment because they take up lots of space.
 unexport distribute generated
+
+# Fnord.
+export inhibit_mach_syscalls=t
+export no_deps=t
+export inhibit_interface_rules=t