diff options
author | ru <ru@FreeBSD.org> | 2006-03-17 18:54:44 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2006-03-17 18:54:44 +0000 |
commit | 388e590f951441f619cd32710dc151e0ac810a10 (patch) | |
tree | 801e953598fc63a37f62cf997017301675552fe9 /sys | |
parent | a251964eaca5833ff2c4651fe4f7f8cac7199da5 (diff) | |
download | FreeBSD-src-388e590f951441f619cd32710dc151e0ac810a10.zip FreeBSD-src-388e590f951441f619cd32710dc151e0ac810a10.tar.gz |
Reimplementation of world/kernel build options. For details, see:
http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html
The src.conf(5) manpage is to follow in a few days.
Brought to you by: imp, jhb, kris, phk, ru (all bugs are mine)
Diffstat (limited to 'sys')
-rw-r--r-- | sys/Makefile | 4 | ||||
-rw-r--r-- | sys/boot/Makefile | 4 | ||||
-rw-r--r-- | sys/boot/alpha/common/Makefile.common | 4 | ||||
-rw-r--r-- | sys/boot/i386/loader/Makefile | 4 | ||||
-rw-r--r-- | sys/boot/ia64/efi/Makefile | 7 | ||||
-rw-r--r-- | sys/boot/ia64/ski/Makefile | 7 | ||||
-rw-r--r-- | sys/boot/pc98/loader/Makefile | 4 | ||||
-rw-r--r-- | sys/boot/powerpc/loader/Makefile | 4 | ||||
-rw-r--r-- | sys/boot/powerpc/ofw/Makefile | 4 | ||||
-rw-r--r-- | sys/boot/sparc64/loader/Makefile | 4 | ||||
-rw-r--r-- | sys/modules/Makefile | 10 | ||||
-rw-r--r-- | sys/modules/dummynet/Makefile | 4 | ||||
-rw-r--r-- | sys/modules/if_bridge/Makefile | 4 | ||||
-rw-r--r-- | sys/modules/if_gif/Makefile | 8 | ||||
-rw-r--r-- | sys/modules/ipfilter/Makefile | 4 | ||||
-rw-r--r-- | sys/modules/ipfw/Makefile | 4 | ||||
-rw-r--r-- | sys/modules/netgraph/Makefile | 6 | ||||
-rw-r--r-- | sys/modules/pf/Makefile | 4 | ||||
-rw-r--r-- | sys/modules/pflog/Makefile | 4 |
19 files changed, 67 insertions, 27 deletions
diff --git a/sys/Makefile b/sys/Makefile index 4fd38d6..24c6126 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -1,7 +1,9 @@ # $FreeBSD$ +.include <bsd.own.mk> + # The boot loader -.if !defined(NO_BOOT) +.if ${MK_BOOT} != "no" .if ${MACHINE_ARCH} != "arm" SUBDIR= boot .endif diff --git a/sys/boot/Makefile b/sys/boot/Makefile index d9b9e50..975f03c 100644 --- a/sys/boot/Makefile +++ b/sys/boot/Makefile @@ -1,6 +1,8 @@ # $FreeBSD$ -.if !defined(NO_FORTH) +.include <bsd.own.mk> + +.if ${MK_FORTH} != "no" # Build the add-in FORTH interpreter. SUBDIR+= ficl .endif diff --git a/sys/boot/alpha/common/Makefile.common b/sys/boot/alpha/common/Makefile.common index bbe9099..9523188 100644 --- a/sys/boot/alpha/common/Makefile.common +++ b/sys/boot/alpha/common/Makefile.common @@ -2,6 +2,8 @@ # # Common Alpha loader build rules +.include <bsd.own.mk> + .PATH: ${.CURDIR}/../common PROG= ${BOOT}.sym @@ -15,7 +17,7 @@ SRCS+= dev_net.c .PATH: ${.CURDIR}/../libalpha -.if !defined(NO_FORTH) +.if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index ad23397..6b260fa 100644 --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + PROG= loader.sym INTERNALPROG= NEWVERSWHAT= "bootstrap loader" i386 @@ -18,7 +20,7 @@ CFLAGS+= -DLOADER_NFS_SUPPORT HAVE_PNP= yes HAVE_ISABUS= yes -.if !defined(NO_FORTH) +.if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386 diff --git a/sys/boot/ia64/efi/Makefile b/sys/boot/ia64/efi/Makefile index 6524992..f5fed73 100644 --- a/sys/boot/ia64/efi/Makefile +++ b/sys/boot/ia64/efi/Makefile @@ -1,9 +1,12 @@ # $FreeBSD$ +NO_MAN= + +.include <bsd.own.mk> + PROG= loader.sym INTERNALPROG= SRCS= conf.c dev_net.c efimd.c main.c start.S vers.c -NO_MAN= CFLAGS+= -DLOADER CFLAGS+= -I${.CURDIR}/../../efi/include @@ -11,7 +14,7 @@ CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_ARCH} CFLAGS+= -I${.CURDIR}/../../efi/libefi CFLAGS+= -I${.CURDIR}/../../../../lib/libstand -.if !defined(NO_FORTH) +.if ${MK_FORTH} != "no" BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH CFLAGS+= -I${.CURDIR}/../../ficl diff --git a/sys/boot/ia64/ski/Makefile b/sys/boot/ia64/ski/Makefile index c6b8a17..84b06dc 100644 --- a/sys/boot/ia64/ski/Makefile +++ b/sys/boot/ia64/ski/Makefile @@ -1,7 +1,10 @@ # $FreeBSD$ -PROG= skiload NO_MAN= + +.include <bsd.own.mk> + +PROG= skiload NEWVERSWHAT= "ia64 SKI boot" ${MACHINE_ARCH} STRIP= # We must not strip skiload at install time. @@ -16,7 +19,7 @@ CFLAGS+= -I${.CURDIR}/../../efi/include CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_ARCH} LDFLAGS= -Wl,-T${.CURDIR}/ldscript.ia64 -.if !defined(NO_FORTH) +.if ${MK_FORTH} != "no" CFLAGS+= -DBOOT_FORTH CFLAGS+= -I${.CURDIR}/../../ficl CFLAGS+= -I${.CURDIR}/../../ficl/${MACHINE_ARCH} diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile index 9085690..53ec657 100644 --- a/sys/boot/pc98/loader/Makefile +++ b/sys/boot/pc98/loader/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + PROG= loader.sym INTERNALPROG= NEWVERSWHAT= "bootstrap loader" pc98 @@ -19,7 +21,7 @@ CFLAGS+= -DLOADER_NFS_SUPPORT HAVE_PNP= yes HAVE_ISABUS= yes -.if !defined(NO_FORTH) +.if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386 diff --git a/sys/boot/powerpc/loader/Makefile b/sys/boot/powerpc/loader/Makefile index c409729..eccec93 100644 --- a/sys/boot/powerpc/loader/Makefile +++ b/sys/boot/powerpc/loader/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + PROG= loader NEWVERSWHAT= "bootstrap loader" "Open Firmware/PowerPC" BINDIR?= /boot @@ -46,7 +48,7 @@ CFLAGS+= -DLOADER_NFS_SUPPORT CFLAGS+= -DLOADER_TFTP_SUPPORT .endif -.if !defined(NO_FORTH) +.if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc diff --git a/sys/boot/powerpc/ofw/Makefile b/sys/boot/powerpc/ofw/Makefile index c409729..eccec93 100644 --- a/sys/boot/powerpc/ofw/Makefile +++ b/sys/boot/powerpc/ofw/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + PROG= loader NEWVERSWHAT= "bootstrap loader" "Open Firmware/PowerPC" BINDIR?= /boot @@ -46,7 +48,7 @@ CFLAGS+= -DLOADER_NFS_SUPPORT CFLAGS+= -DLOADER_TFTP_SUPPORT .endif -.if !defined(NO_FORTH) +.if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc diff --git a/sys/boot/sparc64/loader/Makefile b/sys/boot/sparc64/loader/Makefile index c8a423d..784ab92 100644 --- a/sys/boot/sparc64/loader/Makefile +++ b/sys/boot/sparc64/loader/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + PROG= loader NEWVERSWHAT= "bootstrap loader" sparc64 INSTALLFLAGS= -b @@ -41,7 +43,7 @@ CFLAGS+= -DLOADER_NFS_SUPPORT CFLAGS+= -DLOADER_TFTP_SUPPORT .endif -.if !defined(NO_FORTH) +.if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/sparc64 diff --git a/sys/modules/Makefile b/sys/modules/Makefile index f17210d..6a6c475 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + SUBDIR= ${_3dfx} \ ${_3dfx_linux} \ ${_aac} \ @@ -295,7 +297,7 @@ _vpo= vpo _ufs= ufs .endif -.if !defined(NO_CRYPT) || defined(ALL_MODULES) +.if ${MK_CRYPT} != "no" || defined(ALL_MODULES) .if exists(${.CURDIR}/../opencrypto) _crypto= crypto _cryptodev= cryptodev @@ -305,11 +307,11 @@ _random= random .endif .endif -.if !defined(NO_IPFILTER) || defined(ALL_MODULES) +.if ${MK_IPFILTER} != "no" || defined(ALL_MODULES) _ipfilter= ipfilter .endif -.if !defined(NO_PF) || defined(ALL_MODULES) +.if ${MK_PF} != "no" || defined(ALL_MODULES) _pf= pf _pflog= pflog .endif @@ -407,7 +409,7 @@ _ipw= ipw _iwi= iwi _mly= mly _nve= nve -.if !defined(NO_CRYPT) || defined(ALL_MODULES) +.if ${MK_CRYPT} != "no" || defined(ALL_MODULES) .if exists(${.CURDIR}/../crypto/via) _padlock= padlock .endif diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile index ecd6cbe..5da69b2 100644 --- a/sys/modules/dummynet/Makefile +++ b/sys/modules/dummynet/Makefile @@ -1,12 +1,14 @@ # $FreeBSD$ +.include <bsd.own.mk> + .PATH: ${.CURDIR}/../../netinet KMOD= dummynet SRCS= ip_dummynet.c SRCS+= opt_inet6.h .if !defined(KERNBUILDDIR) -.if !defined(NO_INET6) +.if ${MK_INET6_SUPPORT} != "no" opt_inet6.h: echo "#define INET6 1" > ${.TARGET} .endif diff --git a/sys/modules/if_bridge/Makefile b/sys/modules/if_bridge/Makefile index fa47a76..d1fc350 100644 --- a/sys/modules/if_bridge/Makefile +++ b/sys/modules/if_bridge/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + .PATH: ${.CURDIR}/../../net KMOD= if_bridge SRCS= if_bridge.c bridgestp.c opt_inet.h opt_inet6.h @@ -8,7 +10,7 @@ SRCS= if_bridge.c bridgestp.c opt_inet.h opt_inet6.h opt_inet.h: echo "#define INET 1" > ${.TARGET} -.if !defined(NO_INET6) +.if ${MK_INET6_SUPPORT} != "no" opt_inet6.h: echo "#define INET6 1" > ${.TARGET} .endif diff --git a/sys/modules/if_gif/Makefile b/sys/modules/if_gif/Makefile index c9d073b..b608f55 100644 --- a/sys/modules/if_gif/Makefile +++ b/sys/modules/if_gif/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + .PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6 KMOD= if_gif @@ -10,7 +12,7 @@ SRCS= if_gif.c in_gif.c opt_inet.h opt_inet6.h opt_mac.h \ opt_inet.h: echo "#define INET 1" > ${.TARGET} -.if !defined(NO_INET6) +.if ${MK_INET6_SUPPORT} != "no" opt_inet6.h: echo "#define INET6 1" > ${.TARGET} .endif @@ -20,11 +22,11 @@ opt_mrouting.h: .else OPT_INET6!= cat ${KERNBUILDDIR}/opt_inet6.h .if empty(OPT_INET6) -NO_INET6= +MK_INET6_SUPPORT= no .endif .endif -.if !defined(NO_INET6) +.if ${MK_INET6_SUPPORT} != "no" SRCS+= in6_gif.c .endif diff --git a/sys/modules/ipfilter/Makefile b/sys/modules/ipfilter/Makefile index 542af84..9cfb0f6 100644 --- a/sys/modules/ipfilter/Makefile +++ b/sys/modules/ipfilter/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + .PATH: ${.CURDIR}/../../contrib/ipfilter/netinet KMOD= ipl @@ -12,7 +14,7 @@ SRCS+= opt_bpf.h opt_inet6.h opt_bpf.h: echo "#define DEV_BPF 1" > ${.TARGET} -.if !defined(NO_INET6) +.if ${MK_INET6_SUPPORT} != "no" opt_inet6.h: echo "#define INET6 1" > ${.TARGET} .endif diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile index 5c433e2..3a305f9 100644 --- a/sys/modules/ipfw/Makefile +++ b/sys/modules/ipfw/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + .PATH: ${.CURDIR}/../../netinet KMOD= ipfw @@ -17,7 +19,7 @@ CFLAGS+= -DIPFIREWALL # .if !defined(KERNBUILDDIR) -.if !defined(NO_INET6) +.if ${MK_INET6_SUPPORT} != "no" opt_inet6.h: echo "#define INET6 1" > ${.TARGET} .endif diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile index b2b6af4..6bf4cc4 100644 --- a/sys/modules/netgraph/Makefile +++ b/sys/modules/netgraph/Makefile @@ -1,6 +1,8 @@ # $Whistle: Makefile,v 1.5 1999/01/24 06:48:37 archie Exp $ # $FreeBSD$ +.include <bsd.own.mk> + SUBDIR= async \ atm \ atmllc \ @@ -52,11 +54,11 @@ _sync_ar= sync_ar _sync_sr= sync_sr .endif -.if !defined(NO_BLUETOOTH) || defined(ALL_MODULES) +.if ${MK_BLUETOOTH} != "no" || defined(ALL_MODULES) _bluetooth= bluetooth .endif -.if !defined(NO_CRYPT) && exists(${.CURDIR}/../../crypto/rc4/rc4.c) +.if ${MK_CRYPT} != "no" && exists(${.CURDIR}/../../crypto/rc4/rc4.c) _mppc= mppc .endif diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile index 11e00e2..3cff478 100644 --- a/sys/modules/pf/Makefile +++ b/sys/modules/pf/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + .PATH: ${.CURDIR}/../../contrib/pf/net .PATH: ${.CURDIR}/../../contrib/pf/netinet @@ -14,7 +16,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/pf opt_inet.h: echo "#define INET 1" > opt_inet.h -.if !defined(NO_INET6) +.if ${MK_INET6_SUPPORT} != "no" opt_inet6.h: echo "#define INET6 1" > opt_inet6.h .endif diff --git a/sys/modules/pflog/Makefile b/sys/modules/pflog/Makefile index f4a83df..12ead12 100644 --- a/sys/modules/pflog/Makefile +++ b/sys/modules/pflog/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + .PATH: ${.CURDIR}/../../contrib/pf/net KMOD= pflog @@ -12,7 +14,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/pf opt_inet.h: echo "#define INET 1" > opt_inet.h -.if !defined(NO_INET6) +.if ${MK_INET6_SUPPORT} != "no" opt_inet6.h: echo "#define INET6 1" > opt_inet6.h .endif |