Module Name: src
Committed By: plunky
Date: Sun Dec 12 12:09:52 UTC 2010
Modified Files:
src/lib: Makefile
Log Message:
rearrange libraries to reduce the number of .WAITs (14 -> 6)
during that, fix some outdated comments & list dependents
To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 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.157 src/lib/Makefile:1.158
--- src/lib/Makefile:1.157 Sun Dec 5 20:11:21 2010
+++ src/lib/Makefile Sun Dec 12 12:09:51 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.157 2010/12/05 20:11:21 pooka Exp $
+# $NetBSD: Makefile,v 1.158 2010/12/12 12:09:51 plunky Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -21,15 +21,29 @@
# below will depend on versions from DESTDIR only.
#
-SUBDIR+=libarch \
- libbsdmalloc libbluetooth libbz2 \
- libcompat libcrypt \
- libintl libkvm libm \
- libossaudio libpci libpmc libposix libprop libpthread \
- libpthread_dbg libpuffs libresolv librmt librpcsvc librt \
- librumpclient libterminfo libusbhid libutil libwrap liby libz
+SUBDIR+= i18n_module
-SUBDIR+= ../external/bsd/libpcap/lib
+SUBDIR+= libarch \
+ libbluetooth libbsdmalloc libbz2 \
+ libcompat libcrypt \
+ libintl libipsec libkvm libm \
+ libossaudio libpci libpmc libposix libprop libpthread \
+ libpthread_dbg libpuffs libresolv librmt librpcsvc librt \
+ librumpclient libtelnet libterminfo \
+ libusbhid libutil libwrap liby libz
+
+.if (${MKKERBEROS} != "no")
+SUBDIR+= libcom_err
+SUBDIR+= libvers
+.endif
+
+.if (${MKSKEY} != "no")
+SUBDIR+= libskey
+.endif
+
+.if (${MKCRYPTO} != "no")
+SUBDIR+= ../crypto/external/bsd/netpgp/libmj
+.endif
.if (${MKMDNS} != "no")
SUBDIR+= ../external/apache2/mDNSResponder/lib
@@ -45,6 +59,7 @@
SUBDIR+= ../external/bsd/libdwarf/lib
SUBDIR+= ../external/bsd/libelf/lib
SUBDIR+= ../external/bsd/libevent/lib
+SUBDIR+= ../external/bsd/libpcap/lib
SUBDIR+= ../external/mit/lua/lib
@@ -56,38 +71,6 @@
SUBDIR+= ../gnu/lib/libobjc4
.endif
-# libcurses needs libtermlib
-SUBDIR+= .WAIT libcurses
-
-# libform and libmenu need libcurses
-SUBDIR+= .WAIT libform libmenu
-
-.if (${MKSKEY} != "no")
-SUBDIR+= libskey
-.endif
-
-# XXX Crypto bits must be done before libtelnet.
-
-.if (${MKCRYPTO} != "no")
-SUBDIR+= ../crypto/external/bsd/openssl/lib
-.endif # MKCRYPTO != no
-
-.if (${MKKERBEROS} != "no")
-# Heimdal Kerberos 5 libraries
-SUBDIR+= .WAIT libroken libvers libcom_err .WAIT libasn1
-SUBDIR+= .WAIT libhx509
-
-.endif # MKKERBEROS != no
-
-SUBDIR+= libtelnet
-
-# IPv6/IPsec
-SUBDIR+= libipsec
-
-# I18N modules
-SUBDIR+= i18n_module
-
-
#
# Libraries that depend upon any listed previously
# (and those that depend upon these [and ...])
@@ -95,28 +78,20 @@
#==================== 1st library dependency barrier ====================
SUBDIR+= .WAIT
-SUBDIR+= libedit # depends on libterm
-
-SUBDIR+= libradius # depends on libcrypto - only if ${MKCRYPTO}
-
-
.if (${MKKERBEROS} != "no")
-SUBDIR+= libkrb5 # depends on libcrypto and more
+SUBDIR+= libasn1 # depends on libcom_err
+SUBDIR+= libroken # depends on libutil, libcrypt
.endif
+SUBDIR+= libcurses # depends on libterminfo
+SUBDIR+= libedit # depends on libterminfo
SUBDIR+= librefuse # depends on libpuffs
SUBDIR+= librumpuser # depends on libpthread
.if (${MKCRYPTO} != "no")
-# these depend on libcrypto*, libz and libbz2
-SUBDIR+= ../crypto/external/bsd/openssh/lib
-SUBDIR+= ../crypto/external/bsd/netpgp/libmj
-SUBDIR+= .WAIT
-SUBDIR+= ../crypto/external/bsd/netpgp/lib
+SUBDIR+= ../crypto/external/bsd/openssl/lib # depends on libcrypt
.endif
-SUBDIR+= ../external/bsd/bind/lib # depends on libcrypto
-SUBDIR+= ../external/bsd/fetch/lib # depends on libssl
SUBDIR+= ../external/bsd/file/lib # depends on libz
.if (${MKISCSI} != "no")
@@ -125,10 +100,6 @@
SUBDIR+= ../external/bsd/libarchive/lib # depends on libxz
-.if (${MKLDAP} != "no")
-SUBDIR+= ../external/bsd/openldap/lib
-.endif
-
.if (${MKBINUTILS} != "no")
SUBDIR+= ../external/gpl3/binutils/lib # libbfd depends on libz
.endif
@@ -141,20 +112,35 @@
#==================== 2nd library dependency barrier ====================
SUBDIR+= .WAIT
+SUBDIR+= libform # depends on libcurses
+
.if (${MKKERBEROS} != "no")
-# Heimdal Kerberos 5 libraries depending on libkrb5 and more
-SUBDIR+= libheimntlm
-SUBDIR+= .WAIT libgssapi libhdb
-SUBDIR+= .WAIT libkadm5srv libkadm5clnt libkafs libsl libss
+SUBDIR+= libhx509 # depends on libcrypto, libasn1, libroken
+SUBDIR+= libsl # depends on libedit, libterminfo
+SUBDIR+= libss # depends on libedit, libterminfo, ...
.endif
+SUBDIR+= libmenu # depends on libcurses
+SUBDIR+= libradius # depends on libcrypto if (${MKCRYPTO} != "no")
SUBDIR+= librump # depends on librumpuser
+.if (${MKCRYPTO} != "no")
+SUBDIR+= ../crypto/external/bsd/openssh/lib # depends on libcrypto, libz
+SUBDIR+= ../crypto/external/bsd/netpgp/lib # depends on libcrypto, ...
+.endif
+
+SUBDIR+= ../external/bsd/bind/lib # depends on libcrypto
+SUBDIR+= ../external/bsd/fetch/lib # depends on libssl
+
+.if (${MKLDAP} != "no")
+SUBDIR+= ../external/bsd/openldap/lib # depends on libcrypto, ...
+.endif
+
#==================== 3rd library dependency barrier ====================
SUBDIR+= .WAIT
-.if (${MKPAM} != "no")
-SUBDIR+= libpam # depends on libkrb5, libkafs and more
+.if (${MKKERBEROS} != "no")
+SUBDIR+= libkrb5 # depends on libhx509, libcrypto, libasn1, ...
.endif
SUBDIR+= librumpdev # depends on librump
@@ -163,10 +149,28 @@
#==================== 4th library dependency barrier ====================
SUBDIR+= .WAIT
-SUBDIR+= libukfs # depends on librump and librumpvfs
+
+.if (${MKKERBEROS} != "no")
+SUBDIR+= libhdb # depends on libkrb5, libasn1, libroken
+SUBDIR+= libheimntlm # depends on libkrb5, libasn1, libroken
+SUBDIR+= libkafs # depends on libkrb5, libroken
+.endif
+
+SUBDIR+= libukfs # depends on librumpvfs, librump
#==================== 5th library dependency barrier ====================
SUBDIR+= .WAIT
-SUBDIR+= libp2k # depends on libpuffs, librumpvfs and libukfs
+
+.if (${MKKERBEROS} != "no")
+SUBDIR+= libgssapi # depends on libheimntlm
+SUBDIR+= libkadm5clnt # depends on libhdb, libkrb5, libroken
+SUBDIR+= libkadm5srv # depends on libhdb, libkrb5, libroken
+.endif
+
+SUBDIR+= libp2k # depends on libukfs, librumpvfs, libpuffs
+
+.if (${MKPAM} != "no")
+SUBDIR+= libpam # depends on libkafs, libkrb5, ...
+.endif
.include <bsd.subdir.mk>
