From owner-p4-projects@FreeBSD.ORG  Tue Mar 12 16:02:04 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 7B50B389; Tue, 12 Mar 2013 16:02:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1F33B387
 for <perforce@freebsd.org>; Tue, 12 Mar 2013 16:02:04 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0E70386A
 for <perforce@freebsd.org>; Tue, 12 Mar 2013 16:02:04 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2CG23iC072629
 for <perforce@freebsd.org>; Tue, 12 Mar 2013 16:02:03 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2CG23Tv072626
 for perforce@freebsd.org; Tue, 12 Mar 2013 16:02:03 GMT
 (envelope-from brooks@freebsd.org)
Date: Tue, 12 Mar 2013 16:02:03 GMT
Message-Id: <201303121602.r2CG23Tv072626@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 222816 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Mar 2013 16:02:04 -0000

http://p4web.freebsd.org/@@222816?ac=10

Change 222816 by brooks@brooks_zenith on 2013/03/12 16:02:03

	Explicitly match source extension so that the various lists of
	TESLA intermediate products don't include C++ files which are
	then added to CLEANFILES and deleted.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#6 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#6 (text+ko) ====

@@ -92,10 +92,19 @@
 
 .endif # !defined(SRCS)
 
-TESLA_FILES=	${SRCS:.c=.tesla}
-OLLS=		${SRCS:.c=.oll}
-INSTRLLS=	${SRCS:.c=.instrll}
-INSTROBJS=	${SRCS:.c=.instro}
+# XXX: forced assignment due to make not figuring out how to make things
+# from generated .c files (which are added to SRCS later).
+CSRC_OBJS:=	${SRCS:M*.c:R:S/$/.object/:N.object}
+CXXSRC_OBJS:=	${SRCS:M*.cc:R:S/$/.object/:N.object} \
+		${SRCS:M*.cpp:R:S/$/.object/:N.object} \
+		${SRCS:M*.cxx:R:S/$/.object/:N.object} \
+		${SRCS:M*.C:R:S/$/.object/:N.object}
+SRC_OBJS=	${CSRC_OBJS} ${CXX_OBJS}
+
+TESLA_FILES=	${CSRC_OBJS:.object=.tesla}
+OLLS=		${CSRC_OBJS:.object=.oll}
+INSTRLLS=	${CSRC_OBJS:.object=.instrll}
+INSTROBJS=	${CSRC_OBJS:.object=.instro}
 CLEANFILES+=	${TESLA_FILES} tesla.manifest ${OLLS} ${INSTRLLS} ${INSTROBJS} \
 		${PROG}.instrumented
 
@@ -108,10 +117,7 @@
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${INSTROBJS} ${LDADD} -ltesla
 
 .if defined(LLVM_IR) && !defined(NO_LLVM_IR)
-LOBJS:=		${SRCS:M*.[Cc]:R:S/$/.obc/:N.obc} \
-		${SRCS:M*.cc:R:S/$/.obc/:N.obc} \
-		${SRCS:M*.cpp:R:S/$/.obc/:N.obc} \
-		${SRCS:M*.cxx:R:S/$/.obc/:N.obc}
+LOBJS:=		${SRC_OBJS:.object=.obc}
 CLEANFILES+=	${PROG}.bc ${LOBJS}
 
 .if !empty(LOBJS)