Module Name: src
Committed By: christos
Date: Tue Mar 17 22:20:48 UTC 2020
Modified Files:
src/lib: Makefile
Log Message:
pam and tpm have nothing to do with rump, so limit them to the libraries that
need MKRUMP. (from Tobias Nygren)
To generate a diff of this commit:
cvs rdiff -u -r1.279 -r1.280 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.279 src/lib/Makefile:1.280
--- src/lib/Makefile:1.279 Tue Mar 3 15:01:01 2020
+++ src/lib/Makefile Tue Mar 17 18:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.279 2020/03/03 20:01:01 christos Exp $
+# $NetBSD: Makefile,v 1.280 2020/03/17 22:20:48 christos Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -260,7 +260,6 @@ SUBDIR+= librumpvfs # depends on librump
SUBDIR+= ../crypto/external/bsd/libsaslc # depends on heimdal, openssl
SUBDIR+= ../external/bsd/mdocml/lib
-.if (${MKRUMP} != "no")
#==================== 4th library dependency barrier ====================
SUBDIR+= .WAIT
@@ -269,7 +268,9 @@ SUBDIR+= libpam # depends on heimdal, l
.endif
+.if (${MKRUMP} != "no")
SUBDIR+= libukfs # depends on librumpvfs, librump
+.endif
.if (${MKTPM} != "no")
SUBDIR+= ../crypto/external/cpl/trousers/lib
@@ -288,6 +289,7 @@ SUBDIR+= libp2k # depends on libukfs, l
SUBDIR+= ../crypto/external/cpl/tpm-tools/lib # depends on trousers
.endif
+.if (${MKRUMP} != "no")
.if !defined(BSD_MK_COMPAT_FILE)
SUBDIR+= ../sys/rump/dev/lib
SUBDIR+= ../sys/rump/fs/lib
