Module Name: src
Committed By: mrg
Date: Fri Apr 17 22:17:23 UTC 2015
Modified Files:
src/lib: Makefile
Log Message:
xz/lib depends upon pthread so move it to the 1st dependancy point.
libarchive/lib depends upon xz, so move to the 2nd.
To generate a diff of this commit:
cvs rdiff -u -r1.220 -r1.221 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.220 src/lib/Makefile:1.221
--- src/lib/Makefile:1.220 Sun Jan 25 15:47:36 2015
+++ src/lib/Makefile Fri Apr 17 22:17:23 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.220 2015/01/25 15:47:36 christos Exp $
+# $NetBSD: Makefile,v 1.221 2015/04/17 22:17:23 mrg Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -67,7 +67,6 @@ SUBDIR+= libbpfjit
SUBDIR+= ../external/mit/expat/lib
SUBDIR+= ../external/public-domain/sqlite/lib
-SUBDIR+= ../external/public-domain/xz/lib
SUBDIR+= ../gnu/lib/libmalloc
@@ -91,6 +90,8 @@ SUBDIR+= ../external/lgpl3/mpc/lib/libmp
#==================== 1st library dependency barrier ====================
SUBDIR+= .WAIT
+SUBDIR+= ../external/public-domain/xz/lib # depends on libpthread
+
.if (${MKCRYPTO} != "no")
SUBDIR+= ../crypto/external/bsd/netpgp/libmj
SUBDIR+= ../crypto/external/bsd/netpgp/lib/verify # depends on libz
@@ -126,8 +127,6 @@ SUBDIR+= ../external/bsd/file/lib # depe
SUBDIR+= ../external/bsd/iscsi/lib # depends on libpthread
.endif
-SUBDIR+= ../external/bsd/libarchive/lib # depends on libxz
-
.if (${MKLVM} != "no")
SUBDIR+= ../external/gpl2/lvm2/lib # depends on libprop
.endif
@@ -152,6 +151,8 @@ SUBDIR+= ${SANITIZER_DIR}
#==================== 2nd library dependency barrier ====================
SUBDIR+= .WAIT
+SUBDIR+= ../external/bsd/libarchive/lib # depends on libxz
+
.if (${MKNPF} != "no")
SUBDIR+= npf # depends on libnpf
.endif
