Merged with 4.4lite.

Changed to conform to NetBSD's new RCS Id convention.

usr.bin/mkdep/Makefile

@@ -1,16 +1,10 @@
-#	from: @(#)Makefile	5.4 (Berkeley) 2/19/91
+#	$NetBSD: Makefile,v 1.6 1994/12/23 07:34:55 jtc Exp $
-#	$Id: Makefile,v 1.5 1994/12/22 12:30:21 cgd Exp $
+#	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 MAN=	mkdep.1
 
-#.if (${MACHINE} != "somebody")
 beforeinstall:
 	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/mkdep.gcc.sh ${DESTDIR}/usr/bin/mkdep
-#.else
-#beforeinstall:
-#	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-#	    ${.CURDIR}/mkdep.sh ${DESTDIR}/usr/bin/mkdep
-#.endif
 
 .include <bsd.prog.mk>

usr.bin/mkdep/mkdep.1

@@ -1,5 +1,7 @@
-.\" Copyright (c) 1987, 1990 The Regents of the University of California.
+.\"	$NetBSD: mkdep.1,v 1.3 1994/12/23 07:34:56 jtc Exp $
-.\" All rights reserved.
+.\"
+.\" Copyright (c) 1987, 1990, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)mkdep.1	5.13 (Berkeley) 6/2/91
+.\"     @(#)mkdep.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: mkdep.1,v 1.2 1993/08/01 07:30:45 mycroft Exp $
 .\"
-.Dd June 2, 1991
+.Dd June 6, 1993
 .Dt MKDEP 1
 .Os BSD 4.2
 .Sh NAME

usr.bin/mkdep/mkdep.append

@@ -1,5 +1,7 @@
 #!/bin/sh -
 #
+#	$NetBSD: mkdep.append,v 1.2 1994/12/23 07:34:57 jtc Exp $
+#
 # Copyright (c) 1991, 1993
 #	The Regents of the University of California.  All rights reserved.
 #

usr.bin/mkdep/mkdep.gcc.sh

@@ -1,7 +1,9 @@
 #!/bin/sh -
 #
-# Copyright (c) 1991 The Regents of the University of California.
+#	$NetBSD: mkdep.gcc.sh,v 1.9 1994/12/23 07:34:59 jtc Exp $
-# All rights reserved.
+#
+# Copyright (c) 1991, 1993
+#	The Regents of the University of California.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -31,7 +33,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	@(#)mkdep.gcc.sh	5.3 (Berkeley) 5/6/91
+#	@(#)mkdep.gcc.sh	8.1 (Berkeley) 6/6/93
 #
 
 PATH=/bin:/usr/bin:/usr/ucb
@@ -39,6 +41,7 @@ export PATH
 
 D=.depend			# default dependency file is .depend
 append=0
+pflag=
 
 while :
 	do case "$1" in
@@ -55,7 +58,7 @@ while :
 		# the -p flag produces "program: program.c" style dependencies
 		# so .o's don't get produced
 		-p)
-			SED='s;\.o : ; : ;'
+			pflag=p
 			shift ;;
 		*)
 			break ;;
@@ -71,11 +74,10 @@ TMP=/tmp/mkdep$$
 
 trap 'rm -f $TMP ; exit 1' 1 2 3 13 15
 
-if [ "x${SED}" != "x" ]
+if [ x$pflag = x ]; then
-then
+	gcc -M "$@" | sed -e 's; \./; ;g' > $TMP
-	gcc -M "$@" | sed -e "${SED}" > $TMP
 else
-	gcc -M "$@" > $TMP
+	gcc -M "$@" | sed -e 's;\.o :; :;' -e 's; \./; ;g' > $TMP
 fi
 
 if [ $? != 0 ]; then

usr.bin/mkdep/mkdep.old.compiler

@@ -1,5 +1,7 @@
 #!/bin/sh -
 #
+#	$NetBSD: mkdep.old.compiler,v 1.2 1994/12/23 07:35:00 jtc Exp $
+#
 # Copyright (c) 1991, 1993
 #	The Regents of the University of California.  All rights reserved.
 #

usr.bin/mkdep/mkdep.sh

@@ -1,7 +1,9 @@
 #!/bin/sh -
 #
-# Copyright (c) 1991 The Regents of the University of California.
+#	$NetBSD: mkdep.sh,v 1.3 1994/12/23 07:35:02 jtc Exp $
-# All rights reserved.
+#
+# Copyright (c) 1991, 1993
+#	The Regents of the University of California.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -31,10 +33,10 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	@(#)mkdep.sh	5.19 (Berkeley) 4/12/91
+#	@(#)mkdep.sh	8.1 (Berkeley) 6/6/93
 #
 
-PATH=/bin:/usr/bin:/usr/ucb
+PATH=/bin:/usr/bin:/usr/ucb:/usr/old/bin
 export PATH
 
 D=.depend			# default dependency file is .depend
@@ -55,7 +57,7 @@ while :
 		# the -p flag produces "program: program.c" style dependencies
 		# so .o's don't get produced
 		-p)
-			SED='s;\.o *: ; : ;'
+			SED='s;\.o ; ;'
 			shift ;;
 		*)
 			break ;;

usr.bin/mkdep/mkdep.ultrix

@@ -1,5 +1,7 @@
 #!/bin/sh -
 #
+#	$NetBSD: mkdep.ultrix,v 1.2 1994/12/23 07:35:04 jtc Exp $
+#
 # Copyright (c) 1991, 1993
 #	The Regents of the University of California.  All rights reserved.
 #