Tue Dec 29 23:01:09 2009 UTC ()
avoid some subdirs that need -lcrypto, for MKCRYPTO=no.


(mrg)
diff -r1.147 -r1.148 src/lib/Makefile
cvs diff -r1.147 -r1.148 src/lib/Makefile (expand / switch to unified diff)

--- src/lib/Makefile 2009/11/02 10:13:19 1.147
+++ src/lib/Makefile 2009/12/29 23:01:09 1.148
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.147 2009/11/02 10:13:19 plunky Exp $ 1# $NetBSD: Makefile,v 1.148 2009/12/29 23:01:09 mrg 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 libcurses libintl libkvm libm \ 9 libcurses 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 libterm libusbhid libutil libwrap liby libz 12 libterm libusbhid libutil libwrap liby libz
13 13
14SUBDIR+=../external/bsd/flex/lib 14SUBDIR+=../external/bsd/flex/lib
@@ -51,50 +51,54 @@ SUBDIR+= .WAIT @@ -51,50 +51,54 @@ SUBDIR+= .WAIT
51 51
52SUBDIR+= libedit # depends on libterm 52SUBDIR+= libedit # depends on libterm
53 53
54SUBDIR+= libradius # depends on libcrypto - only if ${MKCRYPTO} 54SUBDIR+= libradius # depends on libcrypto - only if ${MKCRYPTO}
55 55
56 56
57.if (${MKKERBEROS} != "no") 57.if (${MKKERBEROS} != "no")
58SUBDIR+= libkrb5 # depends on libcrypto and more 58SUBDIR+= libkrb5 # depends on libcrypto and more
59.endif 59.endif
60 60
61SUBDIR+= librefuse # depends on libpuffs 61SUBDIR+= librefuse # depends on libpuffs
62SUBDIR+= librumpuser # depends on libpthread 62SUBDIR+= librumpuser # depends on libpthread
63 63
 64.if (${MKCRYPTO} != "no")
64# these depend on libcrypto*, libz and libbz2 65# these depend on libcrypto*, libz and libbz2
65SUBDIR+= ../crypto/external/bsd/openssh/lib 66SUBDIR+= ../crypto/external/bsd/openssh/lib
66SUBDIR+= ../crypto/external/bsd/netpgp/lib 67SUBDIR+= ../crypto/external/bsd/netpgp/lib
 68.endif
67 69
68#==================== 2nd library dependency barrier ==================== 70#==================== 2nd library dependency barrier ====================
69SUBDIR+= .WAIT 71SUBDIR+= .WAIT
70 72
71.if (${MKKERBEROS} != "no") 73.if (${MKKERBEROS} != "no")
72# Heimdal Kerberos 5 libraries depending on libkrb5 and more 74# Heimdal Kerberos 5 libraries depending on libkrb5 and more
73SUBDIR+= libheimntlm 75SUBDIR+= libheimntlm
74SUBDIR+= .WAIT libgssapi libhdb 76SUBDIR+= .WAIT libgssapi libhdb
75SUBDIR+= .WAIT libkadm5srv libkadm5clnt libkafs libsl libss 77SUBDIR+= .WAIT libkadm5srv libkadm5clnt libkafs libsl libss
76.endif 78.endif
77 79
78SUBDIR+= librump # depends on librumpuser 80SUBDIR+= librump # depends on librumpuser
79 81
80#==================== 3rd library dependency barrier ==================== 82#==================== 3rd library dependency barrier ====================
81SUBDIR+= .WAIT 83SUBDIR+= .WAIT
82 84
83.if (${MKPAM} != "no") 85.if (${MKPAM} != "no")
84SUBDIR+= libpam # depends on libkrb5, libkafs and more 86SUBDIR+= libpam # depends on libkrb5, libkafs and more
85.endif 87.endif
86 88
 89.if (${MKCRYPTO} != "no")
87SUBDIR+= librumpcrypto # depends on librump 90SUBDIR+= librumpcrypto # depends on librump
 91.endif
88SUBDIR+= librumpdev # depends on librump 92SUBDIR+= librumpdev # depends on librump
89SUBDIR+= librumpnet # depends on librump 93SUBDIR+= librumpnet # depends on librump
90SUBDIR+= librumpvfs # depends on librump 94SUBDIR+= librumpvfs # depends on librump
91 95
92#==================== 4th library dependency barrier ==================== 96#==================== 4th library dependency barrier ====================
93SUBDIR+= .WAIT 97SUBDIR+= .WAIT
94SUBDIR+= libukfs # depends on librump and librumpvfs 98SUBDIR+= libukfs # depends on librump and librumpvfs
95 99
96#==================== 5th library dependency barrier ==================== 100#==================== 5th library dependency barrier ====================
97SUBDIR+= .WAIT 101SUBDIR+= .WAIT
98SUBDIR+= libp2k # depends on libpuffs, librumpvfs and libukfs 102SUBDIR+= libp2k # depends on libpuffs, librumpvfs and libukfs
99 103
100.include <bsd.subdir.mk> 104.include <bsd.subdir.mk>