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.lib.mk,v
rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.11
retrieving revision 1.23
diff -u -p -r1.11 -r1.23
--- src/share/mk/bsd.lib.mk	1993/04/25 05:21:08	1.11
+++ src/share/mk/bsd.lib.mk	1993/08/15 19:37:06	1.23
@@ -1,4 +1,5 @@
-#	@(#)bsd.lib.mk	5.26 (Berkeley) 5/2/91
+#	from: @(#)bsd.lib.mk	5.26 (Berkeley) 5/2/91
+#	$Id: bsd.lib.mk,v 1.23 1993/08/15 19:37:06 mycroft Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
@@ -10,7 +11,7 @@ LIBGRP?=	bin
 LIBOWN?=	bin
 LIBMODE?=	444
 
-STRIP?=	-s
+STRIP?=		-s
 
 BINGRP?=	bin
 BINOWN?=	bin
@@ -20,7 +21,7 @@ BINMODE?=	555
 
 # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
 .SUFFIXES:
-.SUFFIXES: .out .o .po .s .c .f .y .l .8 .7 .6 .5 .4 .3 .2 .1 .0
+.SUFFIXES: .out .o .po .s .c .cc .C .f .y .l .8 .7 .6 .5 .4 .3 .2 .1 .0
 
 .8.0 .7.0 .6.0 .5.0 .4.0 .3.0 .2.0 .1.0:
 	nroff -mandoc ${.IMPSRC} > ${.TARGET}
@@ -35,6 +36,16 @@ BINMODE?=	555
 	@${LD} -X -r ${.TARGET}
 	@mv a.out ${.TARGET}
 
+.cc.o .C.o:
+	${CXX} ${CXXFLAGS} -c ${.IMPSRC} 
+	@${LD} -x -r ${.TARGET}
+	@mv a.out ${.TARGET}
+
+.cc.po .C.po:
+	${CXX} -p ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+	@${LD} -X -r ${.TARGET}
+	@mv a.out ${.TARGET}
+
 .s.o:
 	${CPP} -E ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \
 	    ${AS} -o ${.TARGET}
@@ -59,20 +70,20 @@ _LIBS=lib${LIB}.a
 
 all: ${_LIBS} ${MANALL}# llib-l${LIB}.ln
 
-OBJS+=	${SRCS:R:S/$/.o/g}
+OBJS+=	${SRCS:N*.h:R:S/$/.o/g}
 
 lib${LIB}.a:: ${OBJS}
 	@echo building standard ${LIB} library
 	@rm -f lib${LIB}.a
 	@${AR} cTq lib${LIB}.a `lorder ${OBJS} | tsort` ${LDADD}
-	ranlib lib${LIB}.a
+	${RANLIB} lib${LIB}.a
 
 POBJS+=	${OBJS:.o=.po}
 lib${LIB}_p.a:: ${POBJS}
 	@echo building profiled ${LIB} library
 	@rm -f lib${LIB}_p.a
 	@${AR} cTq lib${LIB}_p.a `lorder ${POBJS} | tsort` ${LDADD}
-	ranlib lib${LIB}_p.a
+	${RANLIB} lib${LIB}_p.a
 
 llib-l${LIB}.ln: ${SRCS}
 	${LINT} -C${LIB} ${CFLAGS} ${.ALLSRC:M*.c}
@@ -86,45 +97,33 @@ clean:
 .endif
 
 .if !target(cleandir)
-cleandir:
-	rm -f a.out Errs errs mklog core ${CLEANFILES}
-	rm -f ${OBJS}
-	rm -f ${POBJS} profiled/*.o
-	rm -f lib${LIB}.a lib${LIB}_p.a llib-l${LIB}.ln
+cleandir: clean
 	rm -f ${MANALL} ${.CURDIR}/tags .depend
 .endif
 
-.if !target(depend)
-depend: .depend
-.depend: ${SRCS}
-	mkdep ${CFLAGS:M-[ID+]*} ${AINC} ${.ALLSRC}
+.include <bsd.dep.mk>
+afterdepend:
 	@(TMP=/tmp/_depend$$$$; \
-	    sed -e 's/^\([^\.]*\).o:/\1.o \1.po:/' < .depend > $$TMP; \
+	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.po:/' < .depend > $$TMP; \
 	    mv $$TMP .depend)
-.endif
 
 .if !target(install)
 .if !target(beforeinstall)
 beforeinstall:
-	@if [ ! -d "${DESTDIR}${LIBDIR}" ]; then \
-		/bin/rm -f ${DESTDIR}${LIBDIR} ; \
-		mkdir -p ${DESTDIR}${LIBDIR} ; \
-		chown root.wheel ${DESTDIR}${LIBDIR} ; \
-		chmod 755 ${DESTDIR}${LIBDIR} ; \
-	else \
-		true ; \
-	fi
+	@install -d -o root -g wheel -m 755 ${DESTDIR}${LIBDIR}
 .endif
 
 realinstall:
-	ranlib lib${LIB}.a
+#	ranlib lib${LIB}.a
 	install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} lib${LIB}.a \
 	    ${DESTDIR}${LIBDIR}
 	${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}.a
-	ranlib lib${LIB}_p.a
+.if !defined(NOPROFILE)
+#	ranlib lib${LIB}_p.a
 	install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    lib${LIB}_p.a ${DESTDIR}${LIBDIR}
 	${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
+.endif
 #	install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 #	    llib-l${LIB}.ln ${DESTDIR}${LINTLIBDIR}
 .if defined(LINKS) && !empty(LINKS)
@@ -160,28 +159,4 @@ tags: ${SRCS}
 .include <bsd.man.mk>
 .endif
 
-.if !target(obj)
-.if defined(NOOBJ)
-obj:
-.else
-obj:
-	@cd ${.CURDIR}; rm -f obj > /dev/null 2>&1 || true; \
-	here=`pwd`; subdir=`echo $$here | sed 's,^/usr/src/,,'`; \
-	if test $$here != $$subdir ; then \
-		dest=/usr/obj/$$subdir ; \
-		echo "$$here -> $$dest"; ln -s $$dest obj; \
-		if test -d /usr/obj -a ! -d $$dest; then \
-			mkdir -p $$dest; \
-		else \
-			true; \
-		fi; \
-	else \
-		true ; \
-		dest=$$here/obj ; \
-		echo "making $$here/obj" ; \
-		if test ! -d obj ; then \
-			mkdir $$here/obj; \
-		fi; \
-	fi;
-.endif
-.endif
+.include <bsd.obj.mk>