Attachment #196154 for bug #230009

Lines 7-13 SRCS= ip_fw2.c ip_fw_pfil.c ip_fw_bpf.c Link Here

(-)modules/ipfw/Makefile (-1 / +1 lines)
7	SRCS+= ip_fw_dynamic.c ip_fw_log.c ip_fw_eaction.c	7	SRCS+= ip_fw_dynamic.c ip_fw_log.c ip_fw_eaction.c
8	SRCS+= ip_fw_sockopt.c ip_fw_table.c ip_fw_table_algo.c ip_fw_iface.c	8	SRCS+= ip_fw_sockopt.c ip_fw_table.c ip_fw_table_algo.c ip_fw_iface.c
9	SRCS+= ip_fw_table_value.c	9	SRCS+= ip_fw_table_value.c
10	SRCS+= opt_inet.h opt_inet6.h opt_ipdivert.h opt_ipfw.h	10	SRCS+= opt_inet.h opt_inet6.h opt_ipdivert.h opt_ipfw.h opt_global.h
11		11
12	CFLAGS+= -DIPFIREWALL -I${SRCTOP}/sys/contrib/ck/include	12	CFLAGS+= -DIPFIREWALL -I${SRCTOP}/sys/contrib/ck/include
13	#	13	#

Lines 3-8 Link Here

(-)modules/ipfw_nat/Makefile (-1 / +1 lines)
3	.PATH: ${SRCTOP}/sys/netpfil/ipfw	3	.PATH: ${SRCTOP}/sys/netpfil/ipfw
4		4
5	KMOD= ipfw_nat	5	KMOD= ipfw_nat
6	SRCS= ip_fw_nat.c	6	SRCS= ip_fw_nat.c opt_global.h
7		7
8	.include <bsd.kmod.mk>	8	.include <bsd.kmod.mk>

Lines 6-13 KMOD= ipfw_nat64 Link Here

(-)modules/ipfw_nat64/Makefile (-3 / +1 lines)
6	SRCS= ip_fw_nat64.c nat64_translate.c	6	SRCS= ip_fw_nat64.c nat64_translate.c
7	SRCS+= nat64lsn.c nat64lsn_control.c	7	SRCS+= nat64lsn.c nat64lsn_control.c
8	SRCS+= nat64stl.c nat64stl_control.c	8	SRCS+= nat64stl.c nat64stl_control.c
9	SRCS+= opt_ipfw.h	9	SRCS+= opt_ipfw.h opt_global.h
10		10
11	#CFLAGS+= -DIPFIREWALL_NAT64_DIRECT_OUTPUT
12
13	.include <bsd.kmod.mk>	11	.include <bsd.kmod.mk>

Lines 3-8 Link Here

(-)modules/ipfw_nptv6/Makefile (-1 / +1 lines)
3	.PATH: ${SRCTOP}/sys/netpfil/ipfw/nptv6	3	.PATH: ${SRCTOP}/sys/netpfil/ipfw/nptv6
4		4
5	KMOD= ipfw_nptv6	5	KMOD= ipfw_nptv6
6	SRCS= ip_fw_nptv6.c nptv6.c opt_ipfw.h	6	SRCS= ip_fw_nptv6.c nptv6.c opt_ipfw.h opt_global.h
7		7
8	.include <bsd.kmod.mk>	8	.include <bsd.kmod.mk>

Lines 3-8 Link Here

(-)modules/ipfw_pmod/Makefile (-1 / +1 lines)
3	.PATH: ${SRCTOP}/sys/netpfil/ipfw/pmod	3	.PATH: ${SRCTOP}/sys/netpfil/ipfw/pmod
4		4
5	KMOD= ipfw_pmod	5	KMOD= ipfw_pmod
6	SRCS= ip_fw_pmod.c tcpmod.c opt_inet.h opt_inet6.h	6	SRCS= ip_fw_pmod.c tcpmod.c opt_inet.h opt_inet6.h opt_global.h
7		7
8	.include <bsd.kmod.mk>	8	.include <bsd.kmod.mk>

Lines 5-11 Link Here

(-)modules/ipsec/Makefile (-1 / +1 lines)
5	KMOD= ipsec	5	KMOD= ipsec
6	SRCS= if_ipsec.c ipsec.c ipsec_input.c ipsec_mbuf.c ipsec_mod.c \	6	SRCS= if_ipsec.c ipsec.c ipsec_input.c ipsec_mbuf.c ipsec_mod.c \
7	ipsec_output.c xform_ah.c xform_esp.c xform_ipcomp.c \	7	ipsec_output.c xform_ah.c xform_esp.c xform_ipcomp.c \
8	opt_inet.h opt_inet6.h opt_ipsec.h opt_sctp.h	8	opt_inet.h opt_inet6.h opt_ipsec.h opt_sctp.h opt_global.h
9	SRCS.INET= udpencap.c	9	SRCS.INET= udpencap.c
10		10
11	opt_ipsec.h:	11	opt_ipsec.h:

Lines 16-25 opt_pf.h: Link Here

(-)modules/pf/Makefile (-4 lines)
16	echo "#define DEV_PFLOG 1" >> ${.TARGET}	16	echo "#define DEV_PFLOG 1" >> ${.TARGET}
17	echo "#define DEV_PFSYNC 1" >> ${.TARGET}	17	echo "#define DEV_PFSYNC 1" >> ${.TARGET}
18		18
19	.if defined(VIMAGE)
20	opt_global.h:
21	echo "#define VIMAGE 1" >> ${.TARGET}
22	.endif	19	.endif
23	.endif
24		20
25	.include <bsd.kmod.mk>	21	.include <bsd.kmod.mk>




	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_global.h
SRCS+=	bus_if.h device_if.h

.if !defined(KERNBUILDDIR)
.if defined(VIMAGE)
opt_global.h:
	echo "#define VIMAGE 1" >> ${.TARGET}
CFLAGS+=	-include opt_global.h
.endif
.endif

.include <bsd.kmod.mk>




	opt_pf.h opt_inet.h opt_inet6.h opt_global.h
SRCS+=	bus_if.h device_if.h

.if !defined(KERNBUILDDIR)
.if defined(VIMAGE)
opt_global.h:
	echo "#define VIMAGE 1" >> ${.TARGET}
CFLAGS+=	-include opt_global.h
.endif
.endif

.include <bsd.kmod.mk>

Lines 3-9 Link Here

(-)modules/tcp/tcpmd5/Makefile (-1 / +1 lines)
3	.PATH: ${SRCTOP}/sys/netipsec	3	.PATH: ${SRCTOP}/sys/netipsec
4		4
5	KMOD= tcpmd5	5	KMOD= tcpmd5
6	SRCS= xform_tcp.c opt_inet.h opt_inet6.h opt_ipsec.h	6	SRCS= xform_tcp.c opt_inet.h opt_inet6.h opt_ipsec.h opt_global.h
7		7
8	opt_ipsec.h:	8	opt_ipsec.h:
9	@echo "#define IPSEC_SUPPORT 1" > ${.TARGET}	9	@echo "#define IPSEC_SUPPORT 1" > ${.TARGET}

Lines 10-15 Link Here

(-)conf/config.mk (+4 lines)
10	.if !defined(KERNBUILDDIR)	10	.if !defined(KERNBUILDDIR)
11	opt_bpf.h:	11	opt_bpf.h:
12	echo "#define DEV_BPF 1" > ${.TARGET}	12	echo "#define DEV_BPF 1" > ${.TARGET}
		13	.if ${MK_VIMAGE} != "no"
		14	opt_global.h:
		15	@echo "#define VIMAGE 1" > ${.TARGET}
		16	.endif
13	.if ${MK_INET_SUPPORT} != "no"	17	.if ${MK_INET_SUPPORT} != "no"
14	opt_inet.h:	18	opt_inet.h:
15	@echo "#define INET 1" > ${.TARGET}	19	@echo "#define INET 1" > ${.TARGET}

Lines 44-49 __DEFAULT_YES_OPTIONS = \ Link Here

(-)conf/kern.opts.mk (+1 lines)
44	SOURCELESS_UCODE \	44	SOURCELESS_UCODE \
45	TESTS \	45	TESTS \
46	USB_GADGET_EXAMPLES \	46	USB_GADGET_EXAMPLES \
		47	VIMAGE \
47	ZFS	48	ZFS
48		49
49	__DEFAULT_NO_OPTIONS = \	50	__DEFAULT_NO_OPTIONS = \

Return to bug 230009

Lines 7-18 SRCS= if_pflog.c \ Link Here

(-)modules/pflog/Makefile (-8 lines)
7	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_global.h	7	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_global.h
8	SRCS+= bus_if.h device_if.h	8	SRCS+= bus_if.h device_if.h
9		9
10	.if !defined(KERNBUILDDIR)
11	.if defined(VIMAGE)
12	opt_global.h:
13	echo "#define VIMAGE 1" >> ${.TARGET}
14	CFLAGS+= -include opt_global.h
15	.endif
16	.endif
17
18	.include <bsd.kmod.mk>	10	.include <bsd.kmod.mk>

Lines 7-18 SRCS= if_pfsync.c \ Link Here

(-)modules/pfsync/Makefile (-8 lines)
7	opt_pf.h opt_inet.h opt_inet6.h opt_global.h	7	opt_pf.h opt_inet.h opt_inet6.h opt_global.h
8	SRCS+= bus_if.h device_if.h	8	SRCS+= bus_if.h device_if.h
9		9
10	.if !defined(KERNBUILDDIR)
11	.if defined(VIMAGE)
12	opt_global.h:
13	echo "#define VIMAGE 1" >> ${.TARGET}
14	CFLAGS+= -include opt_global.h
15	.endif
16	.endif
17
18	.include <bsd.kmod.mk>	10	.include <bsd.kmod.mk>