From owner-p4-projects@FreeBSD.ORG  Sun Sep  1 20:02:14 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id BCEF6AB9; Sun,  1 Sep 2013 20:02:14 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 6E5A1AB7
 for <perforce@freebsd.org>; Sun,  1 Sep 2013 20:02:14 +0000 (UTC)
 (envelope-from novazeta@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5AA4722CB
 for <perforce@freebsd.org>; Sun,  1 Sep 2013 20:02:14 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r81K2EC7075693
 for <perforce@freebsd.org>; Sun, 1 Sep 2013 20:02:14 GMT
 (envelope-from novazeta@FreeBSD.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r81K2EIO075684
 for perforce@freebsd.org; Sun, 1 Sep 2013 20:02:14 GMT
 (envelope-from novazeta@FreeBSD.org)
Date: Sun, 1 Sep 2013 20:02:14 GMT
Message-Id: <201309012002.r81K2EIO075684@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 novazeta@FreeBSD.org using -f
From: Khilan Gudka <novazeta@FreeBSD.org>
Subject: PERFORCE change 544866 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: Sun, 01 Sep 2013 20:02:14 -0000

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

Change 544866 by novazeta@novazeta_zenith on 2013/09/01 20:01:21

	Added WITH_SOAAP option and CFLAGS line for soaap include directory.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#9 edit
.. //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#13 edit

Differences ...

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

@@ -375,6 +375,7 @@
     OFED \
     OPENSSH_NONE_CIPHER \
     SHARED_TOOLCHAIN \
+    SOAAP \
     TESLA
 
 #

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

@@ -5,6 +5,7 @@
 
 .SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .ln .s .S .asm
 
+
 # XXX The use of COPTS in modern makefiles is discouraged.
 .if defined(COPTS)
 CFLAGS+=${COPTS}
@@ -87,6 +88,10 @@
 		${LLVM_LINK} -o ${.TARGET} ${OIRS} ;\
 	fi
 
+.if ${MK_SOAAP} != "no"
+CFLAGS+= -I$(SOAAP_SOURCE_DIR)/include
+.endif
+.if ${MK_SOAAP} != "no"
 ${PROG}.soaap: ${PROG}.${LLVM_IR_TYPE}-a
 	${OPT} -load $(SOAAP_BUILD_DIR)/libsoaap.so -soaap ${SOAAP_FLAGS} -o /dev/null ${PROG}.${LLVM_IR_TYPE}-a
 
@@ -101,6 +106,7 @@
 	${CC} $(LDADD) -o ${.TARGET} ${PROG}.po
 
 CLEANFILES+= ${PROG}.po ${PROG}.pbc ${PROG}.soaap_perf ${PROG}.soaap_cg
+.endif 
 
 ${PROG}: ${OBJS}
 .if defined(PROG_CXX)