Recognize ".cpp" as a C++ suffix.

PR:		3476

4 files changed, 14 insertions, 13 deletions

diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index 4a6ae61..1dc24d2 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.dep.mk,v 1.23 1998/05/15 09:30:11 bde Exp $
+#	$Id: bsd.dep.mk,v 1.24 1998/05/15 09:34:48 bde Exp $
 #
 # The include file <bsd.dep.mk> handles Makefile dependencies.
 #
@@ -89,10 +89,11 @@ ${DEPENDFILE}: ${SRCS}
 	    ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BID]*} \
 	    ${.ALLSRC:M*.c}
 .endif
-.if ${SRCS:M*.cc} != "" || ${SRCS:M*.C} != "" || ${SRCS:M*.cxx} != ""
+.if ${SRCS:M*.cc} != "" || ${SRCS:M*.C} != "" || ${SRCS:M*.cpp} != "" || \
+    ${SRCS:M*.cxx} != ""
 	${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \
 	    ${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BID]*} \
-	    ${.ALLSRC:M*.cc} ${.ALLSRC:M*.C} ${.ALLSRC:M*.cxx}
+	    ${.ALLSRC:M*.cc} ${.ALLSRC:M*.C} ${.ALLSRC:M*.cpp} ${.ALLSRC:M*.cxx}
 .endif
 .if ${SRCS:M*.m} != ""
 	${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 2636288..bbabf5e 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.lib.mk	5.26 (Berkeley) 5/2/91
-#	$Id: bsd.lib.mk,v 1.72 1998/05/15 09:34:48 bde Exp $
+#	$Id: bsd.lib.mk,v 1.73 1998/06/04 15:15:38 peter Exp $
 #
 
 .if exists(${.CURDIR}/../Makefile.inc)
@@ -46,7 +46,7 @@ STRIP?=	-s
 # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
 # .so used for PIC object files
 .SUFFIXES:
-.SUFFIXES: .out .o .po .so .s .S .c .cc .cxx .m .C .f .y .l
+.SUFFIXES: .out .o .po .so .s .S .c .cc .cpp .cxx .m .C .f .y .l
 
 .c.o:
 	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
@@ -60,15 +60,15 @@ STRIP?=	-s
 	${CC} ${PICFLAG} -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 	@${LD} -O ${.TARGET} -x -r ${.TARGET}
 
-.cc.o .C.o .cxx.o:
+.cc.o .C.o .cpp.o .cxx.o:
 	${CXX} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 	@${LD} -O ${.TARGET} -x -r ${.TARGET}
 
-.cc.po .C.po .cxx.po:
+.cc.po .C.po .cpp.po .cxx.po:
 	${CXX} -pg ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 	@${LD} -O ${.TARGET} -X -r ${.TARGET}
 
-.cc.so .C.so .cxx.so:
+.cc.so .C.so .cpp.so .cxx.so:
 	${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 	@${LD} -O ${.TARGET} -x -r ${.TARGET}
 
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index d2c7bdb..e35df86 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-#	$Id: bsd.prog.mk,v 1.73 1998/05/15 09:30:12 bde Exp $
+#	$Id: bsd.prog.mk,v 1.74 1998/05/15 09:34:48 bde Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
@@ -8,7 +8,7 @@
 # Default executable format
 BINFORMAT?=	aout
 
-.SUFFIXES: .out .o .c .cc .cxx .C .m .y .l .s .S
+.SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .s .S
 
 CFLAGS+=${COPTS} ${DEBUG_FLAGS}
 .if defined(DESTDIR)
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 1f3ada0..756a592 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,5 +1,5 @@
 #	from: @(#)sys.mk	8.2 (Berkeley) 3/21/94
-#	$Id: sys.mk,v 1.35 1998/06/03 08:51:39 jb Exp $
+#	$Id: sys.mk,v 1.36 1998/06/03 22:07:26 jb Exp $
 
 unix		?=	We run FreeBSD, not UNIX.
 
@@ -15,7 +15,7 @@ unix		?=	We run FreeBSD, not UNIX.
 .if defined(%POSIX)
 .SUFFIXES:	.o .c .y .l .a .sh .f
 .else
-.SUFFIXES:	.out .a .ln .o .c .cc .cxx .C .m .F .f .e .r .y .l .S .s .cl .p .h .sh
+.SUFFIXES:	.out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .s .cl .p .h .sh
 .endif
 
 .LIBS:		.a
@@ -185,7 +185,7 @@ HTAGSFLAGS=
 .c.o:
 	${CC} ${CFLAGS} -c ${.IMPSRC}
 
-.cc.o .cxx.o .C.o:
+.cc.o .cpp.o .cxx.o .C.o:
 	${CXX} ${CXXFLAGS} -c ${.IMPSRC}
 
 .m.o: