Module Name: src
Committed By: pgoyette
Date: Thu Jan 16 02:38:21 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libopencrypto: Makefile
Log Message:
Use existing rumpkern_z library rather than including another copy of
zlib.c
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libopencrypto/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/lib/libopencrypto/Makefile
diff -u src/sys/rump/dev/lib/libopencrypto/Makefile:1.2 src/sys/rump/dev/lib/libopencrypto/Makefile:1.3
--- src/sys/rump/dev/lib/libopencrypto/Makefile:1.2 Thu Jan 16 02:21:24 2014
+++ src/sys/rump/dev/lib/libopencrypto/Makefile Thu Jan 16 02:38:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/01/16 02:21:24 pgoyette Exp $
+# $NetBSD: Makefile,v 1.3 2014/01/16 02:38:20 pgoyette Exp $
#
.PATH: ${.CURDIR}/../../../../opencrypto
@@ -26,9 +26,9 @@ SRCS+= cryptosoft.c
SRCS+= deflate.c
SRCS+= gmac.c
-.PATH: ${.CURDIR}/../../../../net
+# deflate.c also requires zlib, so include the appropriate library
-SRCS+= zlib.c
+LDADD+= -lrumpkern_z
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
