Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib put a wait barrier between trousers and tpm-tools



details:   https://anonhg.NetBSD.org/src/rev/49ba379f4274
branches:  trunk
changeset: 782503:49ba379f4274
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Nov 04 19:48:08 2012 +0000

description:
put a wait barrier between trousers and tpm-tools

diffstat:

 lib/Makefile |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 72ce991e8039 -r 49ba379f4274 lib/Makefile
--- a/lib/Makefile      Sun Nov 04 19:46:42 2012 +0000
+++ b/lib/Makefile      Sun Nov 04 19:48:08 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.191 2012/11/04 19:18:03 christos Exp $
+#      $NetBSD: Makefile,v 1.192 2012/11/04 19:48:08 christos Exp $
 #      from: @(#)Makefile      5.25.1.1 (Berkeley) 5/7/91
 
 .include <bsd.own.mk>
@@ -201,7 +201,6 @@
 
 .if (${MKTPM} != "no")
 SUBDIR+=       ../crypto/external/cpl/trousers/lib
-SUBDIR+=       ../crypto/external/cpl/tpm-tools/lib
 .endif
 
 #==================== 5th library dependency barrier ====================
@@ -209,6 +208,10 @@
 
 SUBDIR+=       libp2k          # depends on libukfs, librumpvfs, libpuffs
 
+.if (${MKTPM} != "no")
+SUBDIR+=       ../crypto/external/cpl/tpm-tools/lib    # depends on trousers
+.endif
+
 .if !defined(BSD_MK_COMPAT_FILE)
 SUBDIR+=       ../sys/rump/dev/lib
 SUBDIR+=       ../sys/rump/fs/lib



Home | Main Index | Thread Index | Old Index