Module Name: src
Committed By: mrg
Date: Thu Oct 3 20:02:58 UTC 2013
Modified Files:
src/lib: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 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.207 src/lib/Makefile:1.208
--- src/lib/Makefile:1.207 Wed Sep 11 23:04:10 2013
+++ src/lib/Makefile Thu Oct 3 20:02:58 2013
@@ -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+= librumpclient
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/libelf/lib
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 @@ SUBDIR+= ../external/lgpl2/mpc/lib/libmp
#==================== 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 @@ SUBDIR+= librumphijack # depends on libr
.if (${MKNPF} != "no")
SUBDIR+= libnpf # depends on libprop
-SUBDIR+= npf
.endif
.if (${MKCRYPTO} != "no")
@@ -161,6 +160,10 @@ SUBDIR+= ../external/gpl3/gcc/lib/libsup
#==================== 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
