From f8c9c51988e57dae4e5df8781961261184815fe6 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sun, 10 Sep 2006 08:58:47 +0000
Subject: [PATCH] Fix the manual build.

---
 sbin/ipf/ipf/Makefile     |  8 ++++----
 sbin/ipf/ipftest/Makefile | 15 +++++++--------
 sbin/ipf/ipmon/Makefile   |  8 ++++----
 sbin/ipf/ipnat/Makefile   |  8 ++++----
 sbin/ipf/ippool/Makefile  |  8 ++++----
 5 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/sbin/ipf/ipf/Makefile b/sbin/ipf/ipf/Makefile
index 4d7c8bf6e234..0a5f4a82c3a2 100644
--- a/sbin/ipf/ipf/Makefile
+++ b/sbin/ipf/ipf/Makefile
@@ -1,15 +1,15 @@
 # $FreeBSD$
 
 PROG=		ipf
-SRCS=		ipf.c ipfcomp.c ipf_y.c ipf_l.c bpf_filter.c
+SRCS=		${GENHDRS} ipf.c ipfcomp.c ipf_y.c ipf_l.c bpf_filter.c
 MAN=		ipf.8 ipf.4 ipf.5 ipl.4
 MLINKS=		ipl.4 ipfilter.4 ipf.5 ipf.conf.5 ipf.5 ipf6.conf.5
 CFLAGS+=	-I. -DIPFILTER_BPF
 
-DPSRCS+=	ipf_l.h ipf_y.h
+GENHDRS=	ipf_l.h ipf_y.h
+DPSRCS+=	${GENHDRS}
 
-CLEANFILES+=	ipf_y.c ipf_y.h
-CLEANFILES+=	ipf_l.c ipf_l.h
+CLEANFILES+=	${GENHDRS} ipf_y.c ipf_l.c
 
 ipf_y.c: ipf_y.y
 	${YACC} -d ${.ALLSRC}
diff --git a/sbin/ipf/ipftest/Makefile b/sbin/ipf/ipftest/Makefile
index 02816cb24fdf..64ea1cfced23 100644
--- a/sbin/ipf/ipftest/Makefile
+++ b/sbin/ipf/ipftest/Makefile
@@ -1,7 +1,7 @@
 #	$FreeBSD$
 
 PROG=		ipftest
-SRCS=		ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \
+SRCS=		${GENHDRS} ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \
 		ip_proxy.c ip_auth.c ip_htable.c ip_lookup.c \
 		ip_pool.c ip_scan.c ip_sync.c ip_rules.c \
 		ip_fil.c ip_log.c ippool_y.c ippool_l.c ipf_y.c \
@@ -13,16 +13,15 @@ CFLAGS+=	-DIPFILTER_LOG -DIPFILTER_COMPILED -DIPFILTER_LOOKUP \
 
 .PATH:		${.CURDIR}/../../../sys/contrib/ipfilter/netinet
 
-DPSRCS+=	ipnat_l.h ipnat_y.h ippool_l.h ippool_y.h ipf_l.h ipf_y.h
+GENHDRS=	ipnat_l.h ipnat_y.h ippool_l.h ippool_y.h ipf_l.h ipf_y.h
+DPSRCS+=	${GENHDRS}
 
-CLEANFILES+=	ipf_y.c ipf_y.h
-CLEANFILES+=	ipf_l.c ipf_l.h
+CLEANFILES+=	${GENHDRS} 
+CLEANFILES+=	ipf_y.c ipf_l.c
 CLEANFILES+=	ipf.tab.c ipf.tab.h
-CLEANFILES+=	ipnat_y.c ipnat_y.h
-CLEANFILES+=	ipnat_l.c ipnat_l.h
+CLEANFILES+=	ipnat_y.c ipnat_l.c
 CLEANFILES+=	ipnat.tab.c ipnat.tab.h
-CLEANFILES+=	ippool_y.c ippool_y.h
-CLEANFILES+=	ippool_l.c ippool_l.h
+CLEANFILES+=	ippool_y.c ippool_l.c
 CLEANFILES+=	ippool.tab.c ippool.tab.h
 
 ipnat_y.c: ipnat_y.y
diff --git a/sbin/ipf/ipmon/Makefile b/sbin/ipf/ipmon/Makefile
index 8103aee0a15d..3639f8733c1e 100644
--- a/sbin/ipf/ipmon/Makefile
+++ b/sbin/ipf/ipmon/Makefile
@@ -1,15 +1,15 @@
 #	$FreeBSD$
 
 PROG=		ipmon
-SRCS=		ipmon.c ipmon_y.c ipmon_l.c
+SRCS=		${GENHDRS} ipmon.c ipmon_y.c ipmon_l.c
 MAN=		ipmon.8
 
 CFLAGS+=	-DLOGFAC=LOG_LOCAL0 -I.
 
-DPSRCS+=	ipmon_l.h ipmon_y.h
+GENHDRS+=	ipmon_l.h ipmon_y.h
+DPSRCS+=	${GENHDRS}
 
-CLEANFILES+=	ipmon_y.c ipmon_y.h
-CLEANFILES+=	ipmon_l.c ipmon_l.h
+CLEANFILES+=	${GENHDRS} ipmon_y.c ipmon_l.c
 
 ipmon_y.c: ipmon_y.y
 	${YACC} -d ${.ALLSRC}
diff --git a/sbin/ipf/ipnat/Makefile b/sbin/ipf/ipnat/Makefile
index 2e24d26af10f..1c017e182cb1 100644
--- a/sbin/ipf/ipnat/Makefile
+++ b/sbin/ipf/ipnat/Makefile
@@ -1,15 +1,15 @@
 #	$FreeBSD$
 
 PROG=		ipnat
-SRCS=		ipnat.c ipnat_y.c ipnat_l.c
+SRCS=		${GENHDRS} ipnat.c ipnat_y.c ipnat_l.c
 MAN=		ipnat.8 ipnat.4 ipnat.5
 MLINKS=		ipnat.5 ipnat.conf.5
 CFLAGS+=	-I.
 
-DPSRCS+=	ipnat_l.h ipnat_y.h
+GENHDRS=	ipnat_l.h ipnat_y.h
+DPSRCS+=	${GENHDRS}
 
-CLEANFILES+=	ipnat_y.c ipnat_y.h
-CLEANFILES+=	ipnat_l.c ipnat_l.h
+CLEANFILES+=	${GENHDRS} ipnat_y.c ipnat_l.c
 
 ipnat_y.c: ipnat_y.y
 	${YACC} -d ${.ALLSRC}
diff --git a/sbin/ipf/ippool/Makefile b/sbin/ipf/ippool/Makefile
index 9ff7c6e3015f..6e3f85da847d 100644
--- a/sbin/ipf/ippool/Makefile
+++ b/sbin/ipf/ippool/Makefile
@@ -1,14 +1,14 @@
 #	$FreeBSD$
 
 PROG=		ippool
-SRCS=		ippool_y.c ippool_l.c kmem.c ippool.c
+SRCS=		${GENHDRS} ippool_y.c ippool_l.c kmem.c ippool.c
 MAN=		ippool.5 ippool.8
 CFLAGS+=	-I.
 
-DPSRCS+=	ippool_l.h ippool_y.h
+GENHDRS=	ippool_l.h ippool_y.h
+DPSRCS+=	${GENHDRS}
 
-CLEANFILES+=	ippool_y.c ippool_y.h
-CLEANFILES+=	ippool_l.c ippool_l.h
+CLEANFILES+=	${GENHDRS} ippool_y.c ippool_l.c
 
 ippool_y.c: ippool_y.y
 	${YACC} -d ${.ALLSRC}