From ec98efa5648c4b0793c5a804eb82d873051c0426 Mon Sep 17 00:00:00 2001 From: yar Date: Wed, 22 Mar 2006 15:56:32 +0000 Subject: [PATCH] MFC in the pf and pflog modules: pf: Respect KERNBUILDDIR. both: Don't depend on DEV_*. Approved by: re (scottl) --- sys/modules/pf/Makefile | 5 ++--- sys/modules/pflog/Makefile | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile index becb2a52b013..11e00e2c649b 100644 --- a/sys/modules/pf/Makefile +++ b/sys/modules/pf/Makefile @@ -10,9 +10,7 @@ SRCS = pf.c pf_if.c pf_subr.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \ CFLAGS+= -I${.CURDIR}/../../contrib/pf -opt_pf.h: - echo "#define DEV_PF 1" > opt_pf.h - +.if !defined(KERNBUILDDIR) opt_inet.h: echo "#define INET 1" > opt_inet.h @@ -23,5 +21,6 @@ opt_inet6.h: opt_bpf.h: echo "#define DEV_BPF 1" > opt_bpf.h +.endif .include diff --git a/sys/modules/pflog/Makefile b/sys/modules/pflog/Makefile index a2ce41140ff2..f4a83df9708c 100644 --- a/sys/modules/pflog/Makefile +++ b/sys/modules/pflog/Makefile @@ -9,9 +9,6 @@ SRCS = if_pflog.c \ CFLAGS+= -I${.CURDIR}/../../contrib/pf .if !defined(KERNBUILDDIR) -opt_pf.h: - echo "#define DEV_PFLOG 1" > opt_pf.h - opt_inet.h: echo "#define INET 1" > opt_inet.h