[src/trunk]: src/lib sort, and move some things up the list after heimdal was...

[plunky <plunky%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/79ed37f2787d
branches:  trunk
changeset: 768569:79ed37f2787d
user:      plunky <plunky%NetBSD.org@localhost>
date:      Sat Aug 20 22:23:47 2011 +0000

description:
sort, and move some things up the list after heimdal was moved
to its own directory. removes one dependency barrier.

diffstat:

 lib/Makefile |  33 ++++++++++++++-------------------
 1 files changed, 14 insertions(+), 19 deletions(-)

diffs (82 lines):

diff -r f728f1ff6bab -r 79ed37f2787d lib/Makefile
--- a/lib/Makefile      Sat Aug 20 22:16:56 2011 +0000
+++ b/lib/Makefile      Sat Aug 20 22:23:47 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.174 2011/08/20 22:16:56 plunky Exp $
+#      $NetBSD: Makefile,v 1.175 2011/08/20 22:23:47 plunky Exp $
 #      from: @(#)Makefile      5.25.1.1 (Berkeley) 5/7/91
 
 .include <bsd.own.mk>
@@ -95,10 +95,11 @@
 SUBDIR+=       libcurses       # depends on libterminfo
 SUBDIR+=       libdm           # depends on libprop
 SUBDIR+=       libedit         # depends on libterminfo
+SUBDIR+=       libperfuse      # depends on libpuffs
 SUBDIR+=       libquota        # depends on libprop and librpcsvc
 SUBDIR+=       librefuse       # depends on libpuffs
-SUBDIR+=       libperfuse      # depends on libpuffs
 SUBDIR+=       librumpuser     # depends on libpthread
+SUBDIR+=       librumphijack   # depends on librumpclient and libpthread
 
 .if (${MKNPF} != "no")
 SUBDIR+=       libnpf          # depends on libprop
@@ -138,16 +139,15 @@
 SUBDIR+=       .WAIT
 
 SUBDIR+=       libform         # depends on libcurses
+SUBDIR+=       libmenu         # depends on libcurses
+SUBDIR+=       libradius       # depends on libcrypto if (${MKCRYPTO} != "no")
+SUBDIR+=       librump         # depends on librumpuser
 
 .if (${MKKERBEROS} != "no")
 SUBDIR+=       ../crypto/external/bsd/heimdal/lib      # depends on libcrypto
                                                        # 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, ...
@@ -160,8 +160,6 @@
 SUBDIR+=       ../external/bsd/openldap/lib    # depends on libcrypto, ...
 .endif
 
-SUBDIR+=       librumphijack
-
 #==================== 3rd library dependency barrier ====================
 SUBDIR+=       .WAIT
 
@@ -169,6 +167,14 @@
 SUBDIR+=       librumpnet      # depends on librump
 SUBDIR+=       librumpvfs      # depends on librump
 
+.if (${MKPAM} != "no")
+SUBDIR+=       libpam          # depends on heimdal
+.endif
+
+.if (${MKCRYPTO} != "no")
+SUBDIR+=       ../crypto/external/bsd/libsaslc # depends on heimdal, openssl
+.endif
+
 #==================== 4th library dependency barrier ====================
 SUBDIR+=       .WAIT
 
@@ -179,15 +185,4 @@
 
 SUBDIR+=       libp2k          # depends on libukfs, librumpvfs, libpuffs
 
-.if (${MKPAM} != "no")
-SUBDIR+=       libpam          # depends on libkafs, libkrb5, ...
-.endif
-
-#==================== 6th library dependency barrier ====================
-SUBDIR+=       .WAIT
-
-.if (${MKCRYPTO} != "no")
-SUBDIR+=       ../crypto/external/bsd/libsaslc         # depends on gssapi
-.endif
-
 .include <bsd.subdir.mk>