summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contrib/ipfilter/tools/ippool.c2
-rw-r--r--rescue/rescue/Makefile3
-rw-r--r--sbin/ipf/ipf/Makefile11
-rw-r--r--sbin/ipf/ipftest/Makefile13
-rw-r--r--sbin/ipf/ipmon/Makefile3
-rw-r--r--sbin/ipf/ipnat/Makefile3
-rw-r--r--sbin/ipf/ippool/Makefile3
-rw-r--r--sbin/ipf/ipresend/Makefile2
-rw-r--r--sbin/ipf/ipsend/Makefile1
-rw-r--r--sbin/ipf/libipf/Makefile6
10 files changed, 7 insertions, 40 deletions
diff --git a/contrib/ipfilter/tools/ippool.c b/contrib/ipfilter/tools/ippool.c
index d974cb2..5cefc66 100644
--- a/contrib/ipfilter/tools/ippool.c
+++ b/contrib/ipfilter/tools/ippool.c
@@ -639,7 +639,7 @@ char *argv[];
}
}
- printf("%u object%s flushed\n", flush.iplf_count,
+ printf("%zd object%s flushed\n", flush.iplf_count,
(flush.iplf_count == 1) ? "" : "s");
return 0;
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 3c26151..572f108 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -124,7 +124,7 @@ CRUNCH_PROGS_sbin+= ping6
.endif
.if !defined(NO_IPFILTER)
-CRUNCH_PROGS_sbin+= ipf ipfs ipfstat ipmon ipnat
+CRUNCH_PROGS_sbin+= ipf
.endif
# crunchgen does not like C++ programs; this should be fixed someday
@@ -166,6 +166,7 @@ CRUNCH_SRCDIR_atmconfig= $(.CURDIR)/../../sbin/atm/atmconfig
CRUNCH_SRCDIR_fore_dnld= $(.CURDIR)/../../sbin/atm/fore_dnld
CRUNCH_SRCDIR_ilmid= $(.CURDIR)/../../sbin/atm/ilmid
CRUNCH_SRCDIR_rtquery= $(.CURDIR)/../../sbin/routed/rtquery
+CRUNCH_SRCDIR_ipf= $(.CURDIR)/../../sbin/ipf/ipf
CRUNCH_ALIAS_reboot= fastboot halt fasthalt
CRUNCH_ALIAS_restore= rrestore
CRUNCH_ALIAS_dump= rdump
diff --git a/sbin/ipf/ipf/Makefile b/sbin/ipf/ipf/Makefile
index fc8dfe7..820de39 100644
--- a/sbin/ipf/ipf/Makefile
+++ b/sbin/ipf/ipf/Makefile
@@ -1,7 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk> # for MKDYNAMICROOT definition
-
PROG= ipf
SRCS= ipf.c ipfcomp.c ipf_y.c ipf_l.c
MAN= ipf.8 ipf.4 ipf.5 ipl.4
@@ -14,7 +12,6 @@ CLEANFILES+= ipf_y.c ipf_y.h
CLEANFILES+= ipf_l.c ipf_l.h
ipf_y.c: ipf_y.y
- ${_MKTARGET_CREATE}
${YACC} -d ${.ALLSRC}
sed -e 's/yy/ipf_yy/g' \
-e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \
@@ -25,20 +22,18 @@ ipf_y.c: ipf_y.y
ipf_y.h: ipf_y.c
ipf_l.c: lexer.c
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipf_yy/g' \
-e 's/y.tab.h/ipf_y.h/' \
-e 's/lexer.h/ipf_l.h/' \
${.ALLSRC} > ${.TARGET}
ipf_l.h: lexer.h
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipf_yy/g' \
${.ALLSRC} > ${.TARGET}
-BINDIR= /sbin
-.if defined(NO_DYNAMICROOT)
-LDSTATIC?= -static
+.if defined(RESCUE)
+LIBIPF_SRCS!= cd ${.CURDIR}/../libipf && ${MAKE} -V SRCS
+SRCS+= ${LIBIPF_SRCS}
.endif
.include <bsd.prog.mk>
diff --git a/sbin/ipf/ipftest/Makefile b/sbin/ipf/ipftest/Makefile
index 0741d13..02816cb 100644
--- a/sbin/ipf/ipftest/Makefile
+++ b/sbin/ipf/ipftest/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-NOGCCERROR= # defined
-
-.include <bsd.own.mk>
-
PROG= ipftest
SRCS= 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 \
@@ -30,7 +26,6 @@ CLEANFILES+= ippool_l.c ippool_l.h
CLEANFILES+= ippool.tab.c ippool.tab.h
ipnat_y.c: ipnat_y.y
- ${_MKTARGET_CREATE}
${YACC} -b ipnat -d ${.ALLSRC}
sed -e 's/yy/ipnat_yy/g' \
-e 's/y.tab.c/ipnat_y.c/' \
@@ -43,19 +38,16 @@ ipnat_y.c: ipnat_y.y
ipnat_y.h: ipnat_y.c
ipnat_l.c: lexer.c
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipnat_yy/g' \
-e 's/y.tab.h/ipnat_y.h/' \
-e 's/lexer.h/ipnat_l.h/' \
${.ALLSRC} > ${.TARGET}
ipnat_l.h: lexer.h
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipnat_yy/g' \
${.ALLSRC} > ${.TARGET}
ippool_y.c: ippool_y.y
- ${_MKTARGET_CREATE}
${YACC} -b ippool -d ${.ALLSRC}
sed -e 's/yy/ippool_yy/g' \
-e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \
@@ -66,19 +58,16 @@ ippool_y.c: ippool_y.y
ippool_y.h: ippool_y.c
ippool_l.c: lexer.c
- ${_MKTARGET_CREATE}
sed -e 's/yy/ippool_yy/g' \
-e 's/y.tab.h/ippool_y.h/' \
-e 's/lexer.h/ippool_l.h/' \
${.ALLSRC} > ${.TARGET}
ippool_l.h: lexer.h
- ${_MKTARGET_CREATE}
sed -e 's/yy/ippool_yy/g' \
${.ALLSRC} > ${.TARGET}
ipf_y.c: ipf_y.y
- ${_MKTARGET_CREATE}
${YACC} -b ipf -d ${.ALLSRC}
sed -e 's/yy/ipf_yy/g' \
-e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \
@@ -89,14 +78,12 @@ ipf_y.c: ipf_y.y
ipf_y.h: ipf_y.c
ipf_l.c: lexer.c
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipf_yy/g' \
-e 's/y.tab.h/ipf_y.h/' \
-e 's/lexer.h/ipf_l.h/' \
${.ALLSRC} > ${.TARGET}
ipf_l.h: lexer.h
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipf_yy/g' \
${.ALLSRC} > ${.TARGET}
diff --git a/sbin/ipf/ipmon/Makefile b/sbin/ipf/ipmon/Makefile
index 8a71cb4..8103aee 100644
--- a/sbin/ipf/ipmon/Makefile
+++ b/sbin/ipf/ipmon/Makefile
@@ -12,7 +12,6 @@ CLEANFILES+= ipmon_y.c ipmon_y.h
CLEANFILES+= ipmon_l.c ipmon_l.h
ipmon_y.c: ipmon_y.y
- ${_MKTARGET_CREATE}
${YACC} -d ${.ALLSRC}
sed -e 's/yy/ipmon_yy/g' \
-e 's/"ipmon_y.y"/"..\/tools\/ipmon_y.y"/' \
@@ -23,14 +22,12 @@ ipmon_y.c: ipmon_y.y
ipmon_y.h: ipmon_y.c
ipmon_l.c: lexer.c
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipmon_yy/g' \
-e 's/y.tab.h/ipmon_y.h/' \
-e 's/lexer.h/ipmon_l.h/' \
${.ALLSRC} > ${.TARGET}
ipmon_l.h: lexer.h
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipmon_yy/g' \
${.ALLSRC} > ${.TARGET}
diff --git a/sbin/ipf/ipnat/Makefile b/sbin/ipf/ipnat/Makefile
index 03ac597..2e24d26 100644
--- a/sbin/ipf/ipnat/Makefile
+++ b/sbin/ipf/ipnat/Makefile
@@ -12,7 +12,6 @@ CLEANFILES+= ipnat_y.c ipnat_y.h
CLEANFILES+= ipnat_l.c ipnat_l.h
ipnat_y.c: ipnat_y.y
- ${_MKTARGET_CREATE}
${YACC} -d ${.ALLSRC}
sed -e 's/yy/ipnat_yy/g' \
-e 's/y.tab.c/ipnat_y.c/' \
@@ -25,14 +24,12 @@ ipnat_y.c: ipnat_y.y
ipnat_y.h: ipnat_y.c
ipnat_l.c: lexer.c
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipnat_yy/g' \
-e 's/y.tab.h/ipnat_y.h/' \
-e 's/lexer.h/ipnat_l.h/' \
${.ALLSRC} > ${.TARGET}
ipnat_l.h: lexer.h
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipnat_yy/g' \
${.ALLSRC} > ${.TARGET}
diff --git a/sbin/ipf/ippool/Makefile b/sbin/ipf/ippool/Makefile
index d1cf18a..9ff7c6e 100644
--- a/sbin/ipf/ippool/Makefile
+++ b/sbin/ipf/ippool/Makefile
@@ -11,7 +11,6 @@ CLEANFILES+= ippool_y.c ippool_y.h
CLEANFILES+= ippool_l.c ippool_l.h
ippool_y.c: ippool_y.y
- ${_MKTARGET_CREATE}
${YACC} -d ${.ALLSRC}
sed -e 's/yy/ippool_yy/g' \
-e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \
@@ -22,14 +21,12 @@ ippool_y.c: ippool_y.y
ippool_y.h: ippool_y.c
ippool_l.c: lexer.c
- ${_MKTARGET_CREATE}
sed -e 's/yy/ippool_yy/g' \
-e 's/y.tab.h/ippool_y.h/' \
-e 's/lexer.h/ippool_l.h/' \
${.ALLSRC} > ${.TARGET}
ippool_l.h: lexer.h
- ${_MKTARGET_CREATE}
sed -e 's/yy/ippool_yy/g' \
${.ALLSRC} > ${.TARGET}
diff --git a/sbin/ipf/ipresend/Makefile b/sbin/ipf/ipresend/Makefile
index 9ce1454..5e0ac15 100644
--- a/sbin/ipf/ipresend/Makefile
+++ b/sbin/ipf/ipresend/Makefile
@@ -1,7 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
PROG= ipresend
SRCS= ipresend.c ip.c resend.c sbpf.c sock.c 44arp.c
MAN= ipresend.1
diff --git a/sbin/ipf/ipsend/Makefile b/sbin/ipf/ipsend/Makefile
index f555c37..4ae4c34 100644
--- a/sbin/ipf/ipsend/Makefile
+++ b/sbin/ipf/ipsend/Makefile
@@ -23,7 +23,6 @@ DPSRCS+= iplang_y.h
${NETBSDSRCDIR}/dist/ipf/iplang
iplang_y.c: iplang_y.y
- ${_MKTARGET_CREATE}
${YACC} -d ${.ALLSRC}
mv y.tab.c ${.TARGET}
mv y.tab.h ${.TARGET:.c=.h}
diff --git a/sbin/ipf/libipf/Makefile b/sbin/ipf/libipf/Makefile
index 0f2f90c..5df741f 100644
--- a/sbin/ipf/libipf/Makefile
+++ b/sbin/ipf/libipf/Makefile
@@ -1,11 +1,7 @@
# $FreeBSD$
-MKPRIVATELIB= yes
-USE_SHLIBDIR= yes
-
-NOGCCERROR= # defined
-
LIB= ipf
+INTERNALLIB=
SRCS= addicmp.c addipopt.c addkeep.c bcopywrap.c binprint.c \
buildopts.c checkrev.c count6bits.c count4bits.c debug.c \
OpenPOWER on IntegriCloud