From owner-svn-src-projects@FreeBSD.ORG Sat Feb 19 17:14:03 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81D20106564A; Sat, 19 Feb 2011 17:14:03 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6731D8FC13; Sat, 19 Feb 2011 17:14:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1JHE3wg003586; Sat, 19 Feb 2011 17:14:03 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1JHE35r003582; Sat, 19 Feb 2011 17:14:03 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201102191714.p1JHE35r003582@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Sat, 19 Feb 2011 17:14:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218860 - in projects/pf/pf45/sys/modules: pf pflog pfsync X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Feb 2011 17:14:03 -0000 Author: bz Date: Sat Feb 19 17:14:03 2011 New Revision: 218860 URL: http://svn.freebsd.org/changeset/base/218860 Log: Unify and cleanup module Makefiles. Modified: projects/pf/pf45/sys/modules/pf/Makefile projects/pf/pf45/sys/modules/pflog/Makefile projects/pf/pf45/sys/modules/pfsync/Makefile Modified: projects/pf/pf45/sys/modules/pf/Makefile ============================================================================== --- projects/pf/pf45/sys/modules/pf/Makefile Sat Feb 19 17:13:32 2011 (r218859) +++ projects/pf/pf45/sys/modules/pf/Makefile Sat Feb 19 17:14:03 2011 (r218860) @@ -6,12 +6,12 @@ .PATH: ${.CURDIR}/../../contrib/pf/netinet KMOD= pf -SRCS = pf.c pf_if.c pf_lb.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \ +SRCS= pf.c pf_if.c pf_lb.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \ pf_ruleset.c \ in4_cksum.c \ opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_global.h -CFLAGS+= -I${.CURDIR}/../../contrib/pf +CFLAGS+= -I${.CURDIR}/../../contrib/pf .if !defined(KERNBUILDDIR) opt_inet.h: @@ -36,9 +36,7 @@ opt_pf.h: .if defined(VIMAGE) opt_global.h: echo "#define VIMAGE 1" >> ${.TARGET} -CFLAGS+= -include ${.CURDIR}/opt_global.h .endif .endif - .include Modified: projects/pf/pf45/sys/modules/pflog/Makefile ============================================================================== --- projects/pf/pf45/sys/modules/pflog/Makefile Sat Feb 19 17:13:32 2011 (r218859) +++ projects/pf/pf45/sys/modules/pflog/Makefile Sat Feb 19 17:14:03 2011 (r218860) @@ -5,12 +5,15 @@ .PATH: ${.CURDIR}/../../contrib/pf/net KMOD= pflog -SRCS = if_pflog.c \ +SRCS= if_pflog.c \ opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h -CFLAGS+= -I${.CURDIR}/../../contrib/pf +CFLAGS+= -I${.CURDIR}/../../contrib/pf +SRCS+= bus_if.h device_if.h -.if !defined(KERNBUILDDIR) +.if defined(KERNBUILDDIR) +MKDEP+= -include ${KERNBUILDDIR}/opt_global.h +.else opt_inet.h: echo "#define INET 1" > ${.TARGET} @@ -21,6 +24,13 @@ opt_inet6.h: opt_bpf.h: echo "#define DEV_BPF 1" > ${.TARGET} + +.if defined(VIMAGE) +opt_global.h: + echo "#define VIMAGE 1" >> ${.TARGET} +CFLAGS+= -include opt_global.h +MKDEP+= -include opt_global.h +.endif .endif .include Modified: projects/pf/pf45/sys/modules/pfsync/Makefile ============================================================================== --- projects/pf/pf45/sys/modules/pfsync/Makefile Sat Feb 19 17:13:32 2011 (r218859) +++ projects/pf/pf45/sys/modules/pfsync/Makefile Sat Feb 19 17:14:03 2011 (r218860) @@ -5,13 +5,15 @@ .PATH: ${.CURDIR}/../../contrib/pf/net KMOD= pfsync -SRCS = if_pfsync.c \ +SRCS= if_pfsync.c \ opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h -CFLAGS+= -I${.CURDIR}/../../contrib/pf -SRCS+= bus_if.h device_if.h +CFLAGS+= -I${.CURDIR}/../../contrib/pf +SRCS+= bus_if.h device_if.h -.if !defined(KERNBUILDDIR) +.if defined(KERNBUILDDIR) +MKDEP+= -include ${KERNBUILDDIR}/opt_global.h +.else opt_inet.h: echo "#define INET 1" > ${.TARGET} @@ -25,8 +27,9 @@ opt_bpf.h: .if defined(VIMAGE) opt_global.h: - echo "#define VIMAGE 1" > ${.TARGET} -CFLAGS+= -I${.CURDIR}/opt_global.h + echo "#define VIMAGE 1" >> ${.TARGET} +CFLAGS+= -include opt_global.h +MKDEP+= -include opt_global.h .endif .endif