diff options
| author | Pawel Jakub Dawidek <pjd@FreeBSD.org> | 2007-04-06 02:13:30 +0000 |
|---|---|---|
| committer | Pawel Jakub Dawidek <pjd@FreeBSD.org> | 2007-04-06 02:13:30 +0000 |
| commit | ceef0c312c45e7c90d77464504d7d03f844353a1 (patch) | |
| tree | 68061d702528db74c169d6aa01f0e844a5723925 /Makefile.inc1 | |
| parent | ad6d01d151201ffd605a80d9fa5556ff23ad122e (diff) | |
| download | src-test-ceef0c312c45e7c90d77464504d7d03f844353a1.tar.gz src-test-ceef0c312c45e7c90d77464504d7d03f844353a1.zip | |
Connect ZFS to the build.
Notes
Notes:
svn path=/head/; revision=168409
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 411b56892aeb2..42913f57f0143 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 |