Module Name: src
Committed By: rmind
Date: Fri Feb 4 00:19:52 UTC 2011
Modified Files:
src/usr.sbin/npf/npfctl: Makefile
src/usr.sbin/pf/ftp-proxy: Makefile
Log Message:
Fix sun2 builds. Noted by joerg@.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/npf/npfctl/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/pf/ftp-proxy/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npfctl/Makefile
diff -u src/usr.sbin/npf/npfctl/Makefile:1.3 src/usr.sbin/npf/npfctl/Makefile:1.4
--- src/usr.sbin/npf/npfctl/Makefile:1.3 Wed Feb 2 02:20:25 2011
+++ src/usr.sbin/npf/npfctl/Makefile Fri Feb 4 00:19:51 2011
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2011/02/02 02:20:25 rmind Exp $
+# $NetBSD: Makefile,v 1.4 2011/02/04 00:19:51 rmind Exp $
PROG= npfctl
MAN= npfctl.8 npf.conf.5
SRCS= npfctl.c npf_parser.c npf_data.c npf_ncgen.c
-LDADD+= -lnpf
-DPADD+= ${LIBNPF}
+LDADD+= -lnpf -lprop
+DPADD+= ${LIBNPF} ${LIBPROP}
WARNS?= 4
NOLINT= # defined (note: deliberately)
Index: src/usr.sbin/pf/ftp-proxy/Makefile
diff -u src/usr.sbin/pf/ftp-proxy/Makefile:1.5 src/usr.sbin/pf/ftp-proxy/Makefile:1.6
--- src/usr.sbin/pf/ftp-proxy/Makefile:1.5 Wed Feb 2 02:20:26 2011
+++ src/usr.sbin/pf/ftp-proxy/Makefile Fri Feb 4 00:19:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/02/02 02:20:26 rmind Exp $
+# $NetBSD: Makefile,v 1.6 2011/02/04 00:19:52 rmind Exp $
# $OpenBSD: Makefile,v 1.3 2006/11/26 11:31:13 deraadt Exp $
PROG= ftp-proxy
@@ -17,7 +17,7 @@
.if (${MKNPF} != "no")
SRCS+= npf.c
CPPFLAGS+= -DWITH_NPF
-LDADD+= -lnpf
+LDADD+= -lnpf -lprop
.endif
# IP Filter support
