svn commit: r265373 - projects/bmake/pkgs/pseudo/cddl

Simon J. Gerraty sjg at FreeBSD.org
Mon May 5 17:56:10 UTC 2014


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 <dirdeps.mk>


More information about the svn-src-projects mailing list