From root@bt405789.res.ray.com  Thu Jun 11 07:39:49 1998
Received: from cam-mail-relay1.bbnplanet.com (cam-mail-relay1.bbnplanet.com [199.94.215.242])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id HAA28594
          for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Jun 1998 07:39:43 -0700 (PDT)
          (envelope-from root@bt405789.res.ray.com)
Received: from gatekeeper.ray.com (gatekeeper.ray.com [138.125.162.1])
	by cam-mail-relay1.bbnplanet.com (8.8.7/8.8.7) with ESMTP id KAA24149
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Jun 1998 10:39:00 -0400 (EDT)
Received: (mailer@localhost) by gatekeeper.ray.com (8.8.7/8.8.7) id KAA15674 for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Jun 1998 10:13:49 -0400
Received: from bt405789.res.ray.com/138.125.142.45(<root@bt405789.res.ray.com>)
	by gatekeeper.ray.com
	id sma.897573176.005895; Thu Jun 11 09:52:56 1998
Received: (from root@localhost)
	by bt405789.res.ray.com (8.8.8/8.8.7) id JAA01651;
	Thu, 11 Jun 1998 09:46:01 -0500 (EST)
	(envelope-from root)
Message-Id: <199806111446.JAA01651@bt405789.res.ray.com>
Date: Thu, 11 Jun 1998 09:46:01 -0500 (EST)
From: moncrg@bt340707.res.ray.com
Reply-To: moncrg@bt340707.res.ray.com
To: FreeBSD-gnats-submit@freebsd.org
Subject: update share/mk/* to support cpp c++ files
X-Send-Pr-Version: 3.2

>Number:         6913
>Category:       misc
>Synopsis:       update share/mk/* to support cpp c++ files
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 11 07:40:01 PDT 1998
>Closed-Date:    Sun Jun 14 09:09:25 PDT 1998
>Last-Modified:  Sun Jun 14 09:12:21 PDT 1998
>Originator:     Greg Moncreaff
>Release:        FreeBSD 2.2.6-RELEASE i386
>Organization:
>Environment:

	

>Description:

        cpp is a common extension for c++ files,
        why not support in the *.mk files?

>How-To-Repeat:

	

>Fix:
	
diff -c ./bsd.dep.mk /tmp/src/share/mk/bsd.dep.mk
*** ./bsd.dep.mk	Thu Jun 11 09:35:30 1998
--- /tmp/src/share/mk/bsd.dep.mk	Sat Mar  7 08:17:52 1998
***************
*** 39,45 ****
  # .if defined ${SRCS:M*.[sS]} does not work
  __depend_s=	${SRCS:M*.[sS]}
  __depend_c=	${SRCS:M*.c}
! __depend_cc=	${SRCS:M*.cc} ${SRCS:M*.C} ${SRCS:M*.cxx} ${SRCS:M*.cpp}
  
  ${DEPENDFILE}: ${SRCS}
  	rm -f ${DEPENDFILE}
--- 39,45 ----
  # .if defined ${SRCS:M*.[sS]} does not work
  __depend_s=	${SRCS:M*.[sS]}
  __depend_c=	${SRCS:M*.c}
! __depend_cc=	${SRCS:M*.cc} ${SRCS:M*.C} ${SRCS:M*.cxx}
  
  ${DEPENDFILE}: ${SRCS}
  	rm -f ${DEPENDFILE}
***************
*** 54,61 ****
  .if defined(__depend_cc) && !empty(__depend_cc)
  	${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \
  		${CXXFLAGS:M-nostd*} ${CXXFLAGS:M-[BID]*} \
! 		${.ALLSRC:M*.cc} ${.ALLSRC:M*.C} ${.ALLSRC:M*.cxx} \
! 		${.ALLSRC:M*.cpp}
  .endif
  
  .ORDER: ${DEPENDFILE} afterdepend
--- 54,60 ----
  .if defined(__depend_cc) && !empty(__depend_cc)
  	${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \
  		${CXXFLAGS:M-nostd*} ${CXXFLAGS:M-[BID]*} \
! 		${.ALLSRC:M*.cc} ${.ALLSRC:M*.C} ${.ALLSRC:M*.cxx}
  .endif
  
  .ORDER: ${DEPENDFILE} afterdepend
diff -c ./bsd.prog.mk /tmp/src/share/mk/bsd.prog.mk
*** ./bsd.prog.mk	Thu Jun 11 09:17:45 1998
--- /tmp/src/share/mk/bsd.prog.mk	Thu Jul 31 01:12:50 1997
***************
*** 5,11 ****
  .include "${.CURDIR}/../Makefile.inc"
  .endif
  
! .SUFFIXES: .out .o .c .cc .cxx .cpp .C .y .l .s .S
  
  CFLAGS+=${COPTS} ${DEBUG_FLAGS}
  .if defined(DESTDIR)
--- 5,11 ----
  .include "${.CURDIR}/../Makefile.inc"
  .endif
  
! .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S
  
  CFLAGS+=${COPTS} ${DEBUG_FLAGS}
  .if defined(DESTDIR)
diff -c ./sys.mk /tmp/src/share/mk/sys.mk
*** ./sys.mk	Thu Jun 11 09:20:01 1998
--- /tmp/src/share/mk/sys.mk	Sun Apr 20 15:16:13 1997
***************
*** 15,21 ****
  .if defined(%POSIX)
  .SUFFIXES:	.o .c .y .l .a .sh .f
  .else
! .SUFFIXES:	.out .a .ln .o .c .cc .cxx .cpp .C .F .f .e .r .y .l .S .s .cl .p .h .sh
  .endif
  
  .LIBS:		.a
--- 15,21 ----
  .if defined(%POSIX)
  .SUFFIXES:	.o .c .y .l .a .sh .f
  .else
! .SUFFIXES:	.out .a .ln .o .c .cc .cxx .C .F .f .e .r .y .l .S .s .cl .p .h .sh
  .endif
  
  .LIBS:		.a
***************
*** 168,174 ****
  .c.o:
  	${CC} ${CFLAGS} -c ${.IMPSRC}
  
! .cc.o .cxx.o .C.o .cpp.o:
  	${CXX} ${CXXFLAGS} -c ${.IMPSRC}
  
  .p.o:
--- 168,174 ----
  .c.o:
  	${CC} ${CFLAGS} -c ${.IMPSRC}
  
! .cc.o .cxx.o .C.o:
  	${CXX} ${CXXFLAGS} -c ${.IMPSRC}
  
  .p.o:
	

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: steve 
State-Changed-When: Sun Jun 14 09:09:25 PDT 1998 
State-Changed-Why:  
I committed a slightly modified version of your patch (mostly 
to avoid excessive diffs against -current which already had 
this functionality).  Thanks! 
>Unformatted:
