Sat Aug 7 21:32:28 2010 UTC ()
fix the build; we need libmj installed before compiling netpgp binaries.


(christos)
diff -r1.149 -r1.150 src/lib/Makefile
cvs diff -r1.149 -r1.150 src/lib/Makefile (expand / switch to unified diff)

--- src/lib/Makefile 2010/02/03 15:34:40 1.149
+++ src/lib/Makefile 2010/08/07 21:32:28 1.150
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.149 2010/02/03 15:34:40 roy Exp $ 1# $NetBSD: Makefile,v 1.150 2010/08/07 21:32:28 christos Exp $
2# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91 2# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6SUBDIR= csu libc .WAIT libarch \ 6SUBDIR= csu libc .WAIT libarch \
7 libbsdmalloc libbluetooth libbz2 \ 7 libbsdmalloc libbluetooth libbz2 \
8 libcompat libcrypt \ 8 libcompat libcrypt \
9 libintl libkvm libm \ 9 libintl libkvm libm \
10 libossaudio libpcap libpci libpmc libposix libprop libpthread \ 10 libossaudio libpcap libpci libpmc libposix libprop libpthread \
11 libpthread_dbg libpuffs libresolv librmt librpcsvc librt \ 11 libpthread_dbg libpuffs libresolv librmt librpcsvc librt \
12 libterminfo libusbhid libutil libwrap liby libz 12 libterminfo libusbhid libutil libwrap liby libz
13 13
14SUBDIR+=../external/bsd/flex/lib 14SUBDIR+=../external/bsd/flex/lib
@@ -57,26 +57,28 @@ SUBDIR+= libedit # depends on libterm @@ -57,26 +57,28 @@ SUBDIR+= libedit # depends on libterm
57SUBDIR+= libradius # depends on libcrypto - only if ${MKCRYPTO} 57SUBDIR+= libradius # depends on libcrypto - only if ${MKCRYPTO}
58 58
59 59
60.if (${MKKERBEROS} != "no") 60.if (${MKKERBEROS} != "no")
61SUBDIR+= libkrb5 # depends on libcrypto and more 61SUBDIR+= libkrb5 # depends on libcrypto and more
62.endif 62.endif
63 63
64SUBDIR+= librefuse # depends on libpuffs 64SUBDIR+= librefuse # depends on libpuffs
65SUBDIR+= librumpuser # depends on libpthread 65SUBDIR+= librumpuser # depends on libpthread
66 66
67.if (${MKCRYPTO} != "no") 67.if (${MKCRYPTO} != "no")
68# these depend on libcrypto*, libz and libbz2 68# these depend on libcrypto*, libz and libbz2
69SUBDIR+= ../crypto/external/bsd/openssh/lib 69SUBDIR+= ../crypto/external/bsd/openssh/lib
 70# XXX Should restructure netpgp/lib to contain libmj and libnetpgp
 71SUBDIR+= ../crypto/external/bsd/netpgp/libmj
70SUBDIR+= ../crypto/external/bsd/netpgp/lib 72SUBDIR+= ../crypto/external/bsd/netpgp/lib
71.endif 73.endif
72 74
73#==================== 2nd library dependency barrier ==================== 75#==================== 2nd library dependency barrier ====================
74SUBDIR+= .WAIT 76SUBDIR+= .WAIT
75 77
76.if (${MKKERBEROS} != "no") 78.if (${MKKERBEROS} != "no")
77# Heimdal Kerberos 5 libraries depending on libkrb5 and more 79# Heimdal Kerberos 5 libraries depending on libkrb5 and more
78SUBDIR+= libheimntlm 80SUBDIR+= libheimntlm
79SUBDIR+= .WAIT libgssapi libhdb 81SUBDIR+= .WAIT libgssapi libhdb
80SUBDIR+= .WAIT libkadm5srv libkadm5clnt libkafs libsl libss 82SUBDIR+= .WAIT libkadm5srv libkadm5clnt libkafs libsl libss
81.endif 83.endif
82 84