From owner-svn-src-projects@FreeBSD.ORG Mon May 5 17:56:10 2014 Return-Path: Delivered-To: svn-src-projects@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 ESMTPS id D08ED8A5; Mon, 5 May 2014 17:56:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BE566B25; Mon, 5 May 2014 17:56:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s45HuAdv017855; Mon, 5 May 2014 17:56:10 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s45HuAgq017854; Mon, 5 May 2014 17:56:10 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201405051756.s45HuAgq017854@svn.freebsd.org> From: "Simon J. Gerraty" Date: Mon, 5 May 2014 17:56:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r265373 - projects/bmake/pkgs/pseudo/cddl X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2014 17:56:10 -0000 Author: sjg Date: Mon May 5 17:56:10 2014 New Revision: 265373 URL: http://svnweb.freebsd.org/changeset/base/265373 Log: Leverage bsd.opts.mk Modified: projects/bmake/pkgs/pseudo/cddl/Makefile.depend Modified: projects/bmake/pkgs/pseudo/cddl/Makefile.depend ============================================================================== --- projects/bmake/pkgs/pseudo/cddl/Makefile.depend Mon May 5 17:51:27 2014 (r265372) +++ projects/bmake/pkgs/pseudo/cddl/Makefile.depend Mon May 5 17:56:10 2014 (r265373) @@ -4,31 +4,47 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} +.if !defined(MK_CTF) +.include "${SRCTOP}/share/mk/bsd.opts.mk" +.endif + DIRDEPS = \ cddl/lib/drti \ cddl/lib/libavl \ - cddl/lib/libctf \ - cddl/lib/libdtrace \ cddl/lib/libnvpair \ cddl/lib/libumem \ cddl/lib/libuutil \ + cddl/usr.bin/sgsmsg \ + + +DIRDEPS.CTF = \ + cddl/lib/libctf \ + cddl/usr.bin/ctfconvert \ + cddl/usr.bin/ctfdump \ + cddl/usr.bin/ctfmerge \ + cddl/lib/libdtrace \ + cddl/usr.sbin/dtrace \ + cddl/usr.sbin/dtruss \ + + +DIRDEPS.ZFS = \ cddl/lib/libzfs \ cddl/lib/libzfs_core \ cddl/lib/libzpool \ cddl/sbin/zfs \ cddl/sbin/zpool \ - cddl/usr.bin/ctfconvert \ - cddl/usr.bin/ctfdump \ - cddl/usr.bin/ctfmerge \ - cddl/usr.bin/sgsmsg \ cddl/usr.bin/zinject \ cddl/usr.bin/zstreamdump \ cddl/usr.bin/ztest \ - cddl/usr.sbin/dtrace \ - cddl/usr.sbin/dtruss \ cddl/usr.sbin/lockstat \ cddl/usr.sbin/zdb \ cddl/usr.sbin/zhack \ +.for O in CTF ZFS +.if ${MK_$O} == "yes" +DIRDEPS+= ${DIRDEPS.$O} +.endif +.endfor + .include