Module Name: src
Committed By: agc
Date: Thu Nov 22 04:05:57 UTC 2012
Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile
src/crypto/external/bsd/netpgp/lib/verify: Makefile
Log Message:
link libz and libbz2 into the netpgpverify library, rather than into the
executable, via LIBDPLIBS.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/lib/verify/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.2 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.3
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.2 Tue Nov 20 05:26:25 2012
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile Thu Nov 22 04:05:57 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/11/20 05:26:25 agc Exp $
+# $NetBSD: Makefile,v 1.3 2012/11/22 04:05:57 agc Exp $
.include <bsd.own.mk>
@@ -15,9 +15,6 @@ LIBNETPGPVERIFYDIR!= cd ${.CURDIR}/../
LDADD+= -L${LIBNETPGPVERIFYDIR} -lnetpgpverify
DPADD+= ${LIBNETPGPVERIFYDIR}/libnetpgpverify.a
-LDADD+= -lz -lbz2
-DPADD+= ${LIBZ} ${LIBBZ2}
-
EXTDIST= ${.CURDIR}/../../dist/src
.PATH: ${EXTDIST}/netpgpverify
Index: src/crypto/external/bsd/netpgp/lib/verify/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.2 src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.3
--- src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.2 Tue Nov 20 05:26:26 2012
+++ src/crypto/external/bsd/netpgp/lib/verify/Makefile Thu Nov 22 04:05:57 2012
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/11/20 05:26:26 agc Exp $
+# $NetBSD: Makefile,v 1.3 2012/11/22 04:05:57 agc Exp $
+
+.include <bsd.own.mk>
LIB=netpgpverify
SRCS=libverify.c b64.c pgpsum.c
@@ -13,6 +15,9 @@ WARNS=5
EXTDIST=${.CURDIR}/../../dist
.PATH: ${EXTDIST}/src/libverify ${EXTDIST}/src/libdigest ${EXTDIST}/src/libbn ${EXTDIST}/src/librsa
+LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
+LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
+
INCS=verify.h
INCSDIR=/usr/include/netpgp
