From 5bba2114d0aeb3adc36f08ea8c5a0712f29c2e76 Mon Sep 17 00:00:00 2001
From: Max Laier <mlaier@FreeBSD.org>
Date: Sun, 5 Feb 2006 17:17:32 +0000
Subject: Make pflog a seperate module.  As a result pflog_packet() becomes a
 function pointer that is declared in pf_ioctl.c

Requested by:	yar (as part of the module build reorg)
MFC after:	1 week
X-MFC with:	yar's module reorg
---
 sys/modules/Makefile       |  2 ++
 sys/modules/pf/Makefile    |  3 ---
 sys/modules/pflog/Makefile | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 sys/modules/pflog/Makefile

(limited to 'sys/modules')

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index db3d879f660a..f8cc7c05839e 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -180,6 +180,7 @@ SUBDIR=	${_3dfx} \
 	pcn \
 	${_pecoff} \
 	${_pf} \
+	${_pflog} \
 	plip \
 	${_pmc} \
 	portalfs \
@@ -307,6 +308,7 @@ _ipfilter=	ipfilter
 
 .if !defined(NO_PF) || defined(ALL_MODULES)
 _pf=		pf
+_pflog=		pflog
 .endif
 
 .if ${MACHINE_ARCH} == "i386"
diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile
index 9a73c41923dc..bcdbb96461d9 100644
--- a/sys/modules/pf/Makefile
+++ b/sys/modules/pf/Makefile
@@ -2,11 +2,9 @@
 
 .PATH: ${.CURDIR}/../../contrib/pf/net
 .PATH: ${.CURDIR}/../../contrib/pf/netinet
-.PATH: ${.CURDIR}/../../netinet
 
 KMOD=	pf
 SRCS = 	pf.c pf_if.c pf_subr.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \
-	if_pflog.c \
 	in4_cksum.c \
 	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h
 
@@ -15,7 +13,6 @@ CFLAGS+=  -I${.CURDIR}/../../contrib/pf
 .if !defined(KERNBUILDDIR)
 opt_pf.h:
 	echo "#define DEV_PF 1" > opt_pf.h
-	echo "#define DEV_PFLOG 1" >> opt_pf.h
 
 opt_inet.h:
 	echo "#define INET 1" > opt_inet.h
diff --git a/sys/modules/pflog/Makefile b/sys/modules/pflog/Makefile
new file mode 100644
index 000000000000..a2ce41140ff2
--- /dev/null
+++ b/sys/modules/pflog/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../contrib/pf/net
+
+KMOD=	pflog
+SRCS = 	if_pflog.c \
+	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h
+
+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
+
+.if !defined(NO_INET6)
+opt_inet6.h:
+	echo "#define INET6 1" > opt_inet6.h
+.endif
+
+opt_bpf.h:
+	echo "#define DEV_BPF 1" > opt_bpf.h
+.endif
+
+.include <bsd.kmod.mk>
-- 
cgit v1.3