Update.

1998-07-04 17:11 -0400  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* csu/Makefile: Build crt files in lib pass.
	* db2/Makefile (distribute): Add mutex/sco.cc.
	* mach/Machrules: Don't generate .udeps files if no_deps is set.
	* sysdeps/unix/Makefile: Don't generate sysd-syscalls or
	s-proto.d if avoid-generated is set.

	* sysdeps/alpha/Dist: List only one file per line.
	* sysdeps/generic/Dist: Likewise.
	* sysdeps/m68k/fpu/switch/Dist: Likewise.
	* sysdeps/sparc/sparc32/Dist: Likewise.
	* sysdeps/unix/Dist: Likewise.
	* sysdeps/unix/sysv/irix4/Dist: Likewise.

	* sysdeps/mach/hurd/i386/Dist: New file.
	* sysdeps/generic/Dist: Add endutxent.c, getutxent.c, getutxid.c,
	getutxline.c, pututxline.c, setutxent.c, updwtmpx.c, and utmpxname.c.
	* sysdeps/unix/sysv/linux/Dist: Add getresuid.c and getresgid.c.
	* sysdeps/unix/sysv/linux/sparc/sparc32/Dist: Remove __sigtrampoline.S.

14 files changed, 63 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 1c65987..21297f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+1998-07-04 17:11 -0400  Zack Weinberg  <zack@rabi.phys.columbia.edu>
+
+	* csu/Makefile: Build crt files in lib pass.
+	* db2/Makefile (distribute): Add mutex/sco.cc.
+	* mach/Machrules: Don't generate .udeps files if no_deps is set.
+	* sysdeps/unix/Makefile: Don't generate sysd-syscalls or
+	s-proto.d if avoid-generated is set.
+
+	* sysdeps/alpha/Dist: List only one file per line.
+	* sysdeps/generic/Dist: Likewise.
+	* sysdeps/m68k/fpu/switch/Dist: Likewise.
+	* sysdeps/sparc/sparc32/Dist: Likewise.
+	* sysdeps/unix/Dist: Likewise.
+	* sysdeps/unix/sysv/irix4/Dist: Likewise.
+
+	* sysdeps/mach/hurd/i386/Dist: New file.
+	* sysdeps/generic/Dist: Add endutxent.c, getutxent.c, getutxid.c,
+	getutxline.c, pututxline.c, setutxent.c, updwtmpx.c, and utmpxname.c.
+	* sysdeps/unix/sysv/linux/Dist: Add getresuid.c and getresgid.c.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/Dist: Remove __sigtrampoline.S.
+
 1998-07-04 10:14  Ulrich Drepper  <drepper@cygnus.com>
 
 	* libio/Makefile (routines): Add iofread_u and iofwrite_u.
diff --git a/csu/Makefile b/csu/Makefile
index 1e457d6..2fd2f81 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -114,6 +114,9 @@ endif
 
 include ../Rules
 
+# Make these in the lib pass so they're available in time to link things with.
+subdir_lib: $(extra-objs:%=$(objpfx)%)
+
 define link-relocatable
 $(CC) -nostdlib -nostartfiles -r -o $@ $^
 endef
diff --git a/db2/Makefile b/db2/Makefile
index cc530a8..3b46a27 100644
--- a/db2/Makefile
+++ b/db2/Makefile
@@ -47,7 +47,7 @@ distribute = db_int.h config.h compat.h clib/getlong.c btree/btree.src \
 				  os_func.h) \
 	     $(addprefix mutex/,x86.gcc uts4.cc.s sparc.gcc parisc.hp \
 				parisc.gcc alpha.gcc alpha.dec README \
-				68020.gcc tsl_parisc.s)
+				68020.gcc tsl_parisc.s sco.cc)
 
 vpath %.c $(subdir-dirs)
 
diff --git a/mach/Machrules b/mach/Machrules
index f78b15d..89ac567 100644
--- a/mach/Machrules
+++ b/mach/Machrules
@@ -104,6 +104,7 @@ define include-%.defs
 echo '#include <$(firstword $($*.defs) $*.defs)>'
 endef
 
+ifndef no_deps
 # Not an implicit rule so the stamps are never removed as intermediates!
 $(patsubst %,$(objpfx)%.ustamp,$(user-interfaces)): $(objpfx)%.ustamp:
 	rm -f $@
@@ -128,6 +129,7 @@ $(patsubst %,$(objpfx)%.udeps,$(user-interfaces)):
 			  $(@:.udeps=_server.c) $(@:.udeps=_server.h):,' \
 	    $(sed-remove-objpfx) > $@.new
 	mv -f $@.new $@
+endif
 
 # Look for the server stub files where they will be written.
 vpath %_server.c $(addprefix $(objpfx),$(sort $(dir $(server-interfaces))))
diff --git a/sysdeps/alpha/Dist b/sysdeps/alpha/Dist
index 0807ce1..46cf351 100644
--- a/sysdeps/alpha/Dist
+++ b/sysdeps/alpha/Dist
@@ -1,5 +1,8 @@
 divrem.h
-divl.S divq.S reml.S remq.S
+divl.S
+divq.S
+reml.S
+remq.S
 _mcount.S
 stxcpy.S
 stxncpy.S
diff --git a/sysdeps/generic/Dist b/sysdeps/generic/Dist
index 36133eb..190f972 100644
--- a/sysdeps/generic/Dist
+++ b/sysdeps/generic/Dist
@@ -1,6 +1,16 @@
-make_siglist.c signame.c signame.h
+make_siglist.c
+signame.c
+signame.h
 det_endian.c
 entry.h
 errno-loc.c
 getresgid.c
 getresuid.c
+endutxent.c
+getutxent.c
+getutxid.c
+getutxline.c
+pututxline.c
+setutxent.c
+updwtmpx.c
+utmpxname.c
diff --git a/sysdeps/m68k/fpu/switch/Dist b/sysdeps/m68k/fpu/switch/Dist
index 1e00e4c..9288bdd 100644
--- a/sysdeps/m68k/fpu/switch/Dist
+++ b/sysdeps/m68k/fpu/switch/Dist
@@ -1 +1,2 @@
-68881-sw.h switch.c
+68881-sw.h
+switch.c
diff --git a/sysdeps/mach/hurd/i386/Dist b/sysdeps/mach/hurd/i386/Dist
new file mode 100644
index 0000000..c581802
--- /dev/null
+++ b/sysdeps/mach/hurd/i386/Dist
@@ -0,0 +1 @@
+static-start.S
diff --git a/sysdeps/sparc/sparc32/Dist b/sysdeps/sparc/sparc32/Dist
index 8bd3729..236075f 100644
--- a/sysdeps/sparc/sparc32/Dist
+++ b/sysdeps/sparc/sparc32/Dist
@@ -1,3 +1,8 @@
-dotmul.S umul.S
-divrem.m4 sdiv.S udiv.S rem.S urem.S
+dotmul.S
+umul.S
+divrem.m4
+sdiv.S
+udiv.S
+rem.S
+urem.S
 alloca.S
diff --git a/sysdeps/unix/Dist b/sysdeps/unix/Dist
index 9f4ecc4..fbd1f4d 100644
--- a/sysdeps/unix/Dist
+++ b/sysdeps/unix/Dist
@@ -1,5 +1,8 @@
-errnos-tmpl.c errnos.awk
-ioctls-tmpl.c ioctls.awk snarf-ioctls
+errnos-tmpl.c
+errnos.awk
+ioctls-tmpl.c
+ioctls.awk
+snarf-ioctls
 make_errlist.c
 mk-local_lim.c
 s-proto.S
diff --git a/sysdeps/unix/Makefile b/sysdeps/unix/Makefile
index 234caee..18bd88b 100644
--- a/sysdeps/unix/Makefile
+++ b/sysdeps/unix/Makefile
@@ -270,6 +270,7 @@ endif
 
 endif
 
+ifndef avoid-generated
 ifndef inhibit-unix-syscalls
 
 # Sysdep dirs unix/... can contain a file syscalls.list,
@@ -312,3 +313,4 @@ common-generated += s-proto.d
 postclean-generated += sysd-syscalls
 
 endif
+endif
diff --git a/sysdeps/unix/sysv/irix4/Dist b/sysdeps/unix/sysv/irix4/Dist
index cf0a898..09026af 100644
--- a/sysdeps/unix/sysv/irix4/Dist
+++ b/sysdeps/unix/sysv/irix4/Dist
@@ -1 +1,2 @@
-__handler.S sigtramp.c
+__handler.S
+sigtramp.c
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index 89758cd..e813a08 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -77,3 +77,5 @@ xstatconv.c
 getdents64.c
 __sendmsg.S
 __recvmsg.S
+getresuid.c
+getresgid.c
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/Dist b/sysdeps/unix/sysv/linux/sparc/sparc32/Dist
index ed8fc08..b5928d8 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/Dist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/Dist
@@ -1,4 +1,3 @@
-__sigtrampoline.S
 bits/mman.h
 clone.S
 pipe.S