Module Name: src
Committed By: mrg
Date: Tue Jun 9 05:20:16 UTC 2009
Modified Files:
src/lib: Makefile
src/lib/libpam/modules/pam_ssh: Makefile
Log Message:
build libnetpgp and libssh earlier.
look for libssh in the right place.
To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 src/lib/Makefile
cvs rdiff -u -r1.7 -r1.8 src/lib/libpam/modules/pam_ssh/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.138 src/lib/Makefile:1.139
--- src/lib/Makefile:1.138 Sun Jun 7 22:43:02 2009
+++ src/lib/Makefile Tue Jun 9 05:20:15 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.138 2009/06/07 22:43:02 christos Exp $
+# $NetBSD: Makefile,v 1.139 2009/06/09 05:20:15 mrg Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -80,6 +80,10 @@
SUBDIR+= librefuse # depends on libpuffs
SUBDIR+= librumpuser # depends on libpthread
+# these depend on libcrypto*, libz and libbz2
+SUBDIR+= ../crypto/external/bsd/openssh/lib
+SUBDIR+= ../crypto/external/bsd/netpgp/lib
+
#==================== 2nd library dependency barrier ====================
SUBDIR+= .WAIT
Index: src/lib/libpam/modules/pam_ssh/Makefile
diff -u src/lib/libpam/modules/pam_ssh/Makefile:1.7 src/lib/libpam/modules/pam_ssh/Makefile:1.8
--- src/lib/libpam/modules/pam_ssh/Makefile:1.7 Mon Oct 27 07:57:41 2008
+++ src/lib/libpam/modules/pam_ssh/Makefile Tue Jun 9 05:20:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/10/27 07:57:41 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2009/06/09 05:20:16 mrg Exp $
# PAM module for SSH
# $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.18 2004/08/06 07:27:04 cperciva Exp $
@@ -16,7 +16,7 @@
CPPFLAGS+= -I${SSHSRC}
-LIBDPLIBS+= ssh ${.CURDIR}/../../../libssh \
+LIBDPLIBS+= ssh ${.CURDIR}/../../../../crypto/external/bsd/openssh/lib \
crypt ${.CURDIR}/../../../libcrypt \
crypto ${.CURDIR}/../../../libcrypto
