Module Name: src
Committed By: yamt
Date: Thu May 22 16:30:25 UTC 2014
Modified Files:
src/external/bsd [yamt-pagecache]: Makefile
Log Message:
sync with head.
for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.
this commit was splitted into small chunks to avoid
a limitation of cvs. ("Protocol error: too many arguments")
To generate a diff of this commit:
cvs rdiff -u -r1.30.2.4 -r1.30.2.5 src/external/bsd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/Makefile
diff -u src/external/bsd/Makefile:1.30.2.4 src/external/bsd/Makefile:1.30.2.5
--- src/external/bsd/Makefile:1.30.2.4 Wed Jan 16 05:26:14 2013
+++ src/external/bsd/Makefile Thu May 22 16:30:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30.2.4 2013/01/16 05:26:14 yamt Exp $
+# $NetBSD: Makefile,v 1.30.2.5 2014/05/22 16:30:25 yamt Exp $
.include <bsd.own.mk>
@@ -10,7 +10,7 @@ SUBDIR= acpica am-utils bind byacc cron
SUBDIR+= atf
.endif
.if (${MKCRYPTO} != "no")
-SUBDIR+= pkg_install ../../crypto/external/bsd
+SUBDIR+= pkg_install
.endif
# IP Filter
.if (${MKIPFILTER} != "no")
@@ -19,9 +19,15 @@ SUBDIR+=ipf
.if (${MKISCSI} != "no")
SUBDIR+= iscsi
.endif
+.if (${MKKYUA} != "no")
+SUBDIR+= lutok kyua-testers kyua-cli kyua-atf-compat
+.endif
.if (${MKLDAP} != "no")
SUBDIR+= openldap
.endif
+.if (${MKLIBCXX} != "no")
+SUBDIR+= libc++
+.endif
.if (${MKLLVM} != "no")
SUBDIR+= llvm
.endif
@@ -29,4 +35,6 @@ SUBDIR+= llvm
SUBDIR+= pcc
.endif
+SUBDIR+= pdisk dhcp nvi ppp smbfs
+
.include <bsd.subdir.mk>
