Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/pf move common fragments into Makefile.inc.



details:   https://anonhg.NetBSD.org/src/rev/6149e06268b5
branches:  trunk
changeset: 571125:6149e06268b5
user:      yamt <yamt%NetBSD.org@localhost>
date:      Thu Nov 11 12:03:53 2004 +0000

description:
move common fragments into Makefile.inc.

diffstat:

 usr.sbin/pf/Makefile.inc      |  8 +++++++-
 usr.sbin/pf/pfctl/Makefile    |  4 +---
 usr.sbin/pf/spamd/Makefile    |  8 +-------
 usr.sbin/pf/spamlogd/Makefile |  6 +-----
 4 files changed, 10 insertions(+), 16 deletions(-)

diffs (74 lines):

diff -r 7298aec91b7b -r 6149e06268b5 usr.sbin/pf/Makefile.inc
--- a/usr.sbin/pf/Makefile.inc  Thu Nov 11 11:54:51 2004 +0000
+++ b/usr.sbin/pf/Makefile.inc  Thu Nov 11 12:03:53 2004 +0000
@@ -1,4 +1,10 @@
-#      $NetBSD: Makefile.inc,v 1.1 2004/11/11 11:54:51 yamt Exp $
+#      $NetBSD: Makefile.inc,v 1.2 2004/11/11 12:03:53 yamt Exp $
+
+# NetBSD doesn't have syslog_r.
+CPPFLAGS+=     -D'openlog_r(ident, logopt, fac, data)=/*nothing*/'
+CPPFLAGS+=     -D'syslog_r(pri, data, ...)=syslog((pri), __VA_ARGS__)'
+
+WARNS?=        1
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
diff -r 7298aec91b7b -r 6149e06268b5 usr.sbin/pf/pfctl/Makefile
--- a/usr.sbin/pf/pfctl/Makefile        Thu Nov 11 11:54:51 2004 +0000
+++ b/usr.sbin/pf/pfctl/Makefile        Thu Nov 11 12:03:53 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
+#      $NetBSD: Makefile,v 1.2 2004/11/11 12:03:54 yamt Exp $
 #      $OpenBSD: Makefile,v 1.15 2004/03/10 18:49:49 mcbride Exp $
 
 .include <bsd.own.mk>          # for MKDYNAMICROOT definition
@@ -10,8 +10,6 @@
 YFLAGS=
 MAN=   pfctl.8
 
-WARNS?=        1
-
 LDADD+=        -lm
 DPADD+=        ${LIBM}
 
diff -r 7298aec91b7b -r 6149e06268b5 usr.sbin/pf/spamd/Makefile
--- a/usr.sbin/pf/spamd/Makefile        Thu Nov 11 11:54:51 2004 +0000
+++ b/usr.sbin/pf/spamd/Makefile        Thu Nov 11 12:03:53 2004 +0000
@@ -1,16 +1,10 @@
-#      $NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
+#      $NetBSD: Makefile,v 1.2 2004/11/11 12:03:54 yamt Exp $
 #      $OpenBSD: Makefile,v 1.7 2004/02/26 07:28:55 beck Exp $
 
 PROG=  spamd
 SRCS=  spamd.c sdl.c grey.c
 MAN=   spamd.8
 
-WARNS?=        1
-
-# NetBSD doesn't have syslog_r.
-CPPFLAGS+=     -D'openlog_r(ident, logopt, fac, data)=/*nothing*/'
-CPPFLAGS+=     -D'syslog_r(pri, data, ...)=syslog((pri), __VA_ARGS__)'
-
 BINDIR=        /usr/libexec
 
 .include <bsd.prog.mk>
diff -r 7298aec91b7b -r 6149e06268b5 usr.sbin/pf/spamlogd/Makefile
--- a/usr.sbin/pf/spamlogd/Makefile     Thu Nov 11 11:54:51 2004 +0000
+++ b/usr.sbin/pf/spamlogd/Makefile     Thu Nov 11 12:03:53 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
+#      $NetBSD: Makefile,v 1.2 2004/11/11 12:03:54 yamt Exp $
 #      $OpenBSD: Makefile,v 1.2 2004/02/27 19:41:39 david Exp $
 
 PROG=  spamlogd
@@ -7,10 +7,6 @@
 
 CPPFLAGS+=-I${NETBSDSRCDIR}/dist/pf/libexec/spamd
 
-# NetBSD doesn't have syslog_r.
-CPPFLAGS+=     -D'openlog_r(ident, logopt, fac, data)=/*nothing*/'
-CPPFLAGS+=     -D'syslog_r(pri, data, ...)=syslog((pri), __VA_ARGS__)'
-
 BINDIR=        /usr/libexec
 
 .include <bsd.prog.mk>



Home | Main Index | Thread Index | Old Index