From owner-p4-projects@FreeBSD.ORG  Wed Jul 12 02:47:41 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 53A8516A4F4; Wed, 12 Jul 2006 02:47:41 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 22EBE16A4F3
	for <perforce@freebsd.org>; Wed, 12 Jul 2006 02:47:41 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B149C43D45
	for <perforce@freebsd.org>; Wed, 12 Jul 2006 02:47:40 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6C2leJZ045900
	for <perforce@freebsd.org>; Wed, 12 Jul 2006 02:47:40 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6C2lev9045897
	for perforce@freebsd.org; Wed, 12 Jul 2006 02:47:40 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 12 Jul 2006 02:47:40 GMT
Message-Id: <200607120247.k6C2lev9045897@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 101322 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Wed, 12 Jul 2006 02:47:41 -0000

http://perforce.freebsd.org/chv.cgi?CH=101322

Change 101322 by jb@jb_freebsd2 on 2006/07/12 02:47:01

	Convert from using NO_CDDL to use the new build knob MK_CDDL.

Affected files ...

.. //depot/projects/dtrace/src/Makefile.inc1#12 edit
.. //depot/projects/dtrace/src/cddl/Makefile#6 edit
.. //depot/projects/dtrace/src/sys/modules/Makefile#12 edit

Differences ...

==== //depot/projects/dtrace/src/Makefile.inc1#12 (text+ko) ====

@@ -38,10 +38,10 @@
 # We must do etc last for install/distribute to work.
 #
 SUBDIR=	share/info include lib libexec bin
-.if defined(NO_CDDL)
+.if ${MK_CDDL} != "no"
+SUBDIR+=cddl
+.else
 NO_CTF=1
-.else
-SUBDIR+=cddl
 .endif
 .if ${MK_GAMES} != "no"
 SUBDIR+=games
@@ -211,7 +211,7 @@
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH}
-.if defined(NO_CDDL) || defined(NO_CTF)
+.if ${MK_CDDL} == "no" || defined(NO_CTF)
 WMAKEENV+=	NO_CTF=1
 .endif
 WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
@@ -862,7 +862,7 @@
 _pwd_mkdb=	usr.sbin/pwd_mkdb
 .endif
 
-.if !defined(NO_CDDL) && !defined(NO_DTRACE)
+.if ${MK_CDDL} != "no"
 _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf gnu/lib/libdwarf cddl/lib/libelf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
 .endif
 
@@ -1053,7 +1053,7 @@
 _prebuild_libs+=	lib/libypclnt
 .endif
 
-.if !defined(NO_CDDL) && !defined(NO_DTRACE)
+.if ${MK_CDDL} != "no"
 _prebuild_libs+=	cddl/lib
 .endif
 

==== //depot/projects/dtrace/src/cddl/Makefile#6 (text+ko) ====

@@ -1,8 +1,10 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR=
 
-.if !defined(NO_CDDL)
+.if ${MK_CDDL} != "no"
 SUBDIR+=	lib usr.bin usr.sbin
 .endif
 

==== //depot/projects/dtrace/src/sys/modules/Makefile#12 (text+ko) ====

@@ -322,7 +322,7 @@
 _pflog=		pflog
 .endif
 
-.if !defined(NO_CDDL)
+.if ${MK_CDDL} != "no"
 _cyclic=	cyclic
 _dtrace=	dtrace
 .endif