Replaced hacks in sbin/Makefile,v 1.99 and usr.sbin/Makefile,v 1.217
with the NO_IPFILTER make.conf(5) knob. (So that we can "make the-rest-of-the-world" again.)
This commit is contained in:
parent
6a1bd01754
commit
7a43a96ab0
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=92868
@ -113,11 +113,13 @@ copies:
|
|||||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
|
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
|
||||||
${DESTDIR}/usr/include/$i
|
${DESTDIR}/usr/include/$i
|
||||||
.endfor
|
.endfor
|
||||||
|
.if !defined(NO_IPFILTER)
|
||||||
.if exists(${.CURDIR}/../sys/contrib/ipfilter/netinet)
|
.if exists(${.CURDIR}/../sys/contrib/ipfilter/netinet)
|
||||||
cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
|
cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
|
||||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
||||||
${DESTDIR}/usr/include/netinet
|
${DESTDIR}/usr/include/netinet
|
||||||
.endif
|
.endif
|
||||||
|
.endif
|
||||||
.if exists(${.CURDIR}/../sys/contrib/netsmb/include/netsmb)
|
.if exists(${.CURDIR}/../sys/contrib/netsmb/include/netsmb)
|
||||||
cd ${.CURDIR}/../sys/contrib/netsmb/include/netsmb; \
|
cd ${.CURDIR}/../sys/contrib/netsmb/include/netsmb; \
|
||||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${NETSMBHDRS} \
|
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${NETSMBHDRS} \
|
||||||
|
@ -29,11 +29,7 @@ SUBDIR= adjkerntz \
|
|||||||
ifconfig \
|
ifconfig \
|
||||||
init \
|
init \
|
||||||
ip6fw \
|
ip6fw \
|
||||||
ipf \
|
|
||||||
ipfs \
|
|
||||||
ipfstat \
|
|
||||||
ipfw \
|
ipfw \
|
||||||
ipmon \
|
|
||||||
kldconfig \
|
kldconfig \
|
||||||
kldload \
|
kldload \
|
||||||
kldstat \
|
kldstat \
|
||||||
@ -80,6 +76,14 @@ SUBDIR= adjkerntz \
|
|||||||
umount \
|
umount \
|
||||||
vinum
|
vinum
|
||||||
|
|
||||||
|
.if !defined(NO_IPFILTER)
|
||||||
|
SUBDIR+=ipf \
|
||||||
|
ipfs \
|
||||||
|
ipfstat \
|
||||||
|
ipmon \
|
||||||
|
ipnat
|
||||||
|
.endif
|
||||||
|
|
||||||
.if ${MACHINE_ARCH} == "i386"
|
.if ${MACHINE_ARCH} == "i386"
|
||||||
SUBDIR+=cxconfig \
|
SUBDIR+=cxconfig \
|
||||||
kget \
|
kget \
|
||||||
|
@ -41,7 +41,10 @@ etc-examples:
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${SHARED} != "symlinks"
|
.if ${SHARED} != "symlinks"
|
||||||
SUBDIR= ipfilter smbfs
|
SUBDIR= smbfs
|
||||||
|
.if !defined(NO_IPFILTER)
|
||||||
|
SUBDIR+=ipfilter
|
||||||
|
.endif
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.include <bsd.subdir.mk>
|
.include <bsd.subdir.mk>
|
||||||
|
@ -95,6 +95,7 @@
|
|||||||
#NO_FORTRAN= true # do not build g77 and related libraries
|
#NO_FORTRAN= true # do not build g77 and related libraries
|
||||||
#NO_GDB= true # do not build GDB
|
#NO_GDB= true # do not build GDB
|
||||||
#NO_I4B= true # do not build isdn4bsd package
|
#NO_I4B= true # do not build isdn4bsd package
|
||||||
|
#NO_IPFILTER= true # do not build IP Filter package
|
||||||
#NO_LPR= true # do not build lpr and related programs
|
#NO_LPR= true # do not build lpr and related programs
|
||||||
#NO_MAILWRAPPER=true # do not build the mailwrapper(8) MTA selector
|
#NO_MAILWRAPPER=true # do not build the mailwrapper(8) MTA selector
|
||||||
#NO_MODULES= true # do not build modules with the kernel
|
#NO_MODULES= true # do not build modules with the kernel
|
||||||
|
@ -370,6 +370,9 @@ and related libraries.
|
|||||||
.It Va NO_I4B
|
.It Va NO_I4B
|
||||||
.Pq Vt bool
|
.Pq Vt bool
|
||||||
Set to not build isdn4bsd package.
|
Set to not build isdn4bsd package.
|
||||||
|
.It Va NO_IPFILTER
|
||||||
|
.Pq Vt bool
|
||||||
|
Set to not build IP Filter package.
|
||||||
.It Va NO_LPR
|
.It Va NO_LPR
|
||||||
.Pq Vt bool
|
.Pq Vt bool
|
||||||
Set to not build
|
Set to not build
|
||||||
|
@ -41,7 +41,6 @@ SUBDIR= 3dfx \
|
|||||||
if_vlan \
|
if_vlan \
|
||||||
ip6fw \
|
ip6fw \
|
||||||
ip_mroute_mod \
|
ip_mroute_mod \
|
||||||
ipfilter \
|
|
||||||
ipfw \
|
ipfw \
|
||||||
ispfw \
|
ispfw \
|
||||||
joy \
|
joy \
|
||||||
@ -114,6 +113,10 @@ SUBDIR= 3dfx \
|
|||||||
wb \
|
wb \
|
||||||
xl
|
xl
|
||||||
|
|
||||||
|
.if !defined(NO_IPFILTER)
|
||||||
|
SUBDIR+=ipfilter
|
||||||
|
.endif
|
||||||
|
|
||||||
#removed while KSE settles in:
|
#removed while KSE settles in:
|
||||||
# ncp \
|
# ncp \
|
||||||
# nwfs \
|
# nwfs \
|
||||||
|
@ -38,9 +38,6 @@ SUBDIR= IPXrouted \
|
|||||||
ifmcstat \
|
ifmcstat \
|
||||||
inetd \
|
inetd \
|
||||||
iostat \
|
iostat \
|
||||||
ipresend \
|
|
||||||
ipsend \
|
|
||||||
iptest \
|
|
||||||
jail \
|
jail \
|
||||||
kbdcontrol \
|
kbdcontrol \
|
||||||
kbdmap \
|
kbdmap \
|
||||||
@ -127,6 +124,13 @@ SUBDIR= IPXrouted \
|
|||||||
ypset \
|
ypset \
|
||||||
zic
|
zic
|
||||||
|
|
||||||
|
.if !defined(NO_IPFILTER)
|
||||||
|
SUBDIR+=ipftest \
|
||||||
|
ipresend \
|
||||||
|
ipsend \
|
||||||
|
iptest
|
||||||
|
.endif
|
||||||
|
|
||||||
.if !defined(NOLIBC_R) && ${MACHINE_ARCH} != "ia64"
|
.if !defined(NOLIBC_R) && ${MACHINE_ARCH} != "ia64"
|
||||||
SUBDIR+=pppctl
|
SUBDIR+=pppctl
|
||||||
.endif
|
.endif
|
||||||
|
Loading…
Reference in New Issue
Block a user