[src/trunk]: src/lib move netpgp, lua and npf libraries to depenancy points a...

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

details:   https://anonhg.NetBSD.org/src/rev/08b56bb060ae
branches:  trunk
changeset: 790333:08b56bb060ae
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Oct 03 20:02:58 2013 +0000

description:
move netpgp, lua and npf libraries to depenancy points after the
libraries they depend upon.  netpgp wants libz, lua wants libm,
and npf wants libnpf.

diffstat:

 lib/Makefile |  19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diffs (62 lines):

diff -r 9fab0e3794b5 -r 08b56bb060ae lib/Makefile
--- a/lib/Makefile      Thu Oct 03 19:51:37 2013 +0000
+++ b/lib/Makefile      Thu Oct 03 20:02:58 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.207 2013/09/11 23:04:10 joerg Exp $
+#      $NetBSD: Makefile,v 1.208 2013/10/03 20:02:58 mrg Exp $
 #      from: @(#)Makefile      5.25.1.1 (Berkeley) 5/7/91
 
 .include <bsd.own.mk>
@@ -56,11 +56,6 @@
 SUBDIR+=       libskey
 .endif
 
-.if (${MKCRYPTO} != "no")
-SUBDIR+=       ../crypto/external/bsd/netpgp/libmj
-SUBDIR+=       ../crypto/external/bsd/netpgp/lib/verify
-.endif
-
 .if (${MKMDNS} != "no")
 SUBDIR+=       ../external/apache2/mDNSResponder/lib
 .endif
@@ -73,7 +68,6 @@
 SUBDIR+=       ../external/bsd/liblzf/lib
 SUBDIR+=       ../external/bsd/libpcap/lib
 
-SUBDIR+=       ../external/mit/lua/lib
 SUBDIR+=       ../external/mit/expat/lib
 
 SUBDIR+=       ../external/public-domain/sqlite/lib
@@ -104,7 +98,13 @@
 #==================== 1st library dependency barrier ====================
 SUBDIR+=       .WAIT
 
+.if (${MKCRYPTO} != "no")
+SUBDIR+=       ../crypto/external/bsd/netpgp/libmj
+SUBDIR+=       ../crypto/external/bsd/netpgp/lib/verify # depends on libz
+.endif
+
 SUBDIR+=       ../external/bsd/libdwarf/lib # depends on libelf
+SUBDIR+=       ../external/mit/lua/lib # depends on libm
 SUBDIR+=       libcurses       # depends on libterminfo
 SUBDIR+=       libdm           # depends on libprop
 SUBDIR+=       libedit         # depends on libterminfo
@@ -121,7 +121,6 @@
 
 .if (${MKNPF} != "no")
 SUBDIR+=       libnpf          # depends on libprop
-SUBDIR+=       npf
 .endif
 
 .if (${MKCRYPTO} != "no")
@@ -161,6 +160,10 @@
 #==================== 2nd library dependency barrier ====================
 SUBDIR+=       .WAIT
 
+.if (${MKNPF} != "no")
+SUBDIR+=       npf             # depends on libnpf
+.endif
+
 .if (${MKATF} != "no")
 SUBDIR+=       ../external/bsd/atf/lib         # depends on libstdc++
 .endif