Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v
rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.31
retrieving revision 1.38
diff -u -p -r1.31 -r1.38
--- src/share/mk/bsd.prog.mk	1993/10/07 02:12:18	1.31
+++ src/share/mk/bsd.prog.mk	1994/05/22 23:03:58	1.38
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-#	$Id: bsd.prog.mk,v 1.31 1993/10/07 02:12:18 cgd Exp $
+#	$Id: bsd.prog.mk,v 1.38 1994/05/22 23:03:58 jtc Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
@@ -19,12 +19,12 @@ LIBDES?=	/usr/lib/libdes.a
 LIBL?=		/usr/lib/libl.a
 LIBKDB?=	/usr/lib/libkdb.a
 LIBKRB?=	/usr/lib/libkrb.a
+LIBKVM?=	/usr/lib/libkvm.a
 LIBM?=		/usr/lib/libm.a
 LIBMP?=		/usr/lib/libmp.a
 LIBPC?=		/usr/lib/libpc.a
 LIBPLOT?=	/usr/lib/libplot.a
 LIBRESOLV?=	/usr/lib/libresolv.a
-LIBRPC?=	/usr/lib/librpc.a
 LIBRPCSVC?=	/usr/lib/librpcsvc.a
 LIBTERMCAP?=	/usr/lib/libtermcap.a
 LIBUTIL?=	/usr/lib/libutil.a
@@ -49,31 +49,23 @@ CLEANFILES+=strings
 	@rm -f x.C
 .endif
 
+
 .if defined(PROG)
 .if defined(SRCS)
-
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
+.else
+OBJS+=	${PROG}.o
+.endif
 
 .if defined(LDONLY)
 
 ${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD}
-	${LD} ${LDFLAGS} -o ${.TARGET} ${LIBCRT0} ${OBJS} ${LIBC} ${LDADD}
+	${LD} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${LIBCRT0} ${OBJS} ${LIBC} ${LDADD}
 
 .else defined(LDONLY)
 
 ${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD}
-	${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
-
-.endif
-
-.else
-
-SRCS=	${PROG}.c
-
-${PROG}: ${SRCS} ${LIBC} ${DPADD}
-	${CC} ${LDFLAGS} ${CFLAGS} -o ${.TARGET} ${.CURDIR}/${SRCS} ${LDADD}
-
-MKDEP=	-p
+	${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD}
 
 .endif
 
@@ -89,7 +81,7 @@ all: ${PROG}
 
 .if !target(clean)
 clean:
-	rm -f a.out [Ee]rrs mklog core ${PROG} ${OBJS} ${CLEANFILES}
+	rm -f a.out [Ee]rrs mklog core *.core ${PROG} ${OBJS} ${CLEANFILES}
 .endif
 
 cleandir: clean
@@ -97,9 +89,6 @@ cleandir: clean
 .if !target(install)
 .if !target(beforeinstall)
 beforeinstall:
-.if defined(DESTDIR) || defined(BINDIR)
-	@install -d -o root -g wheel -m 755 ${DESTDIR}${BINDIR}
-.endif
 .endif
 .if !target(afterinstall)
 afterinstall: