summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2007-04-06 02:13:30 +0000
committerpjd <pjd@FreeBSD.org>2007-04-06 02:13:30 +0000
commit170e632d642afcedd747a3c8bdf45f63d1a36f53 (patch)
tree68061d702528db74c169d6aa01f0e844a5723925 /Makefile.inc1
parentb65aaf60eca66c27804bf20cc6e6ca80d4f02ac6 (diff)
downloadFreeBSD-src-170e632d642afcedd747a3c8bdf45f63d1a36f53.zip
FreeBSD-src-170e632d642afcedd747a3c8bdf45f63d1a36f53.tar.gz
Connect ZFS to the build.
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc114
1 files changed, 12 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 411b568..42913f5 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -40,6 +40,9 @@ SUBDIR+=bin
.if ${MK_GAMES} != "no"
SUBDIR+=games
.endif
+.if ${MK_CDDL} != "no"
+SUBDIR+=cddl
+.endif
SUBDIR+=gnu include
.if ${MK_KERBEROS} != "no"
SUBDIR+=kerberos5
@@ -430,6 +433,9 @@ build32:
.for _t in obj includes
cd ${.CURDIR}/include; ${LIB32WMAKE} ${_t}
cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t}
+.if ${MK_CDDL} != "no"
+ cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} ${_t}
+.endif
cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t}
.if ${MK_CRYPT} != "no"
cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} ${_t}
@@ -1014,12 +1020,16 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \
lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
- ${_secure_lib_libssl}
+ ${_secure_lib_libssl} lib/libthr
-_generic_libs= gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
+_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
lib/libopie__L lib/libtacplus__L: lib/libmd__L
+.if ${MK_CDDL} != "no"
+_cddl_lib= cddl/lib
+.endif
+
.if ${MK_CRYPT} != "no"
.if ${MK_OPENSSL} != "no"
_secure_lib_libcrypto= secure/lib/libcrypto
OpenPOWER on IntegriCloud