Centralize several variables.
MK_CTF, MK_SSP, MK_PROFILE, NO_PIC, and INTERNALLIB are always the same, so set them in defs.mk. MAN= is common, so set it here too. This removes a lot of boring repetition from the Makefiles that added almost no value.
This commit is contained in:
parent
0fd19f4a95
commit
8299b37f85
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=328769
@ -7,6 +7,13 @@ WARNS?=1
|
|||||||
.if !defined(__BOOT_DEFS_MK__)
|
.if !defined(__BOOT_DEFS_MK__)
|
||||||
__BOOT_DEFS_MK__=${MFILE}
|
__BOOT_DEFS_MK__=${MFILE}
|
||||||
|
|
||||||
|
MK_CTF= no
|
||||||
|
MK_SSP= no
|
||||||
|
MK_PROFILE= no
|
||||||
|
NO_PIC=
|
||||||
|
MAN=
|
||||||
|
INTERNALLIB=
|
||||||
|
|
||||||
BOOTSRC= ${SRCTOP}/stand
|
BOOTSRC= ${SRCTOP}/stand
|
||||||
EFISRC= ${BOOTSRC}/efi
|
EFISRC= ${BOOTSRC}/efi
|
||||||
EFIINC= ${EFISRC}/include
|
EFIINC= ${EFISRC}/include
|
||||||
|
@ -1,12 +1,7 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
MAN=
|
|
||||||
|
|
||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
|
|
||||||
MK_SSP= no
|
|
||||||
MK_FORTH= no
|
|
||||||
|
|
||||||
PROG= boot1.sym
|
PROG= boot1.sym
|
||||||
INTERNALPROG=
|
INTERNALPROG=
|
||||||
WARNS?= 6
|
WARNS?= 6
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
.PATH: ${LDRSRC}
|
.PATH: ${LDRSRC}
|
||||||
|
|
||||||
LIB= efi_fdt
|
LIB= efi_fdt
|
||||||
INTERNALLIB=
|
|
||||||
WARNS?= 6
|
WARNS?= 6
|
||||||
|
|
||||||
SRCS= efi_fdt.c
|
SRCS= efi_fdt.c
|
||||||
|
@ -7,7 +7,6 @@
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
LIB= efi
|
LIB= efi
|
||||||
INTERNALLIB=
|
|
||||||
WARNS?= 2
|
WARNS?= 2
|
||||||
|
|
||||||
SRCS= delay.c devpath.c efi_console.c efichar.c efinet.c efipart.c env.c errno.c \
|
SRCS= delay.c devpath.c efi_console.c efichar.c efinet.c efipart.c env.c errno.c \
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
MAN=
|
|
||||||
|
|
||||||
LOADER_NET_SUPPORT?= yes
|
LOADER_NET_SUPPORT?= yes
|
||||||
LOADER_MSDOS_SUPPORT?= yes
|
LOADER_MSDOS_SUPPORT?= yes
|
||||||
LOADER_UFS_SUPPORT?= yes
|
LOADER_UFS_SUPPORT?= yes
|
||||||
@ -10,8 +8,6 @@ LOADER_EXT2FS_SUPPORT?= no
|
|||||||
|
|
||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
|
|
||||||
MK_SSP= no
|
|
||||||
|
|
||||||
PROG= loader.sym
|
PROG= loader.sym
|
||||||
INTERNALPROG=
|
INTERNALPROG=
|
||||||
WARNS?= 3
|
WARNS?= 3
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
.PATH: ${SYSDIR}/contrib/libfdt/
|
.PATH: ${SYSDIR}/contrib/libfdt/
|
||||||
|
|
||||||
LIB= fdt
|
LIB= fdt
|
||||||
INTERNALLIB=
|
|
||||||
|
|
||||||
# Vendor sources of libfdt.
|
# Vendor sources of libfdt.
|
||||||
SRCS+= fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c \
|
SRCS+= fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c \
|
||||||
|
@ -20,7 +20,6 @@ PROG= testmain
|
|||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
.else
|
.else
|
||||||
LIB= ficl
|
LIB= ficl
|
||||||
INTERNALLIB=
|
|
||||||
.include <bsd.lib.mk>
|
.include <bsd.lib.mk>
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
@ -1,16 +1,11 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
# libgeliboot
|
# libgeliboot
|
||||||
|
|
||||||
MAN=
|
|
||||||
DO32=1
|
DO32=1
|
||||||
|
|
||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
MK_SSP= no
|
|
||||||
|
|
||||||
LIB= geliboot
|
LIB= geliboot
|
||||||
INTERNALLIB=
|
|
||||||
MK_PROFILE= no
|
|
||||||
NO_PIC=
|
|
||||||
|
|
||||||
# Our password input method
|
# Our password input method
|
||||||
SRCS+= pwgets.c
|
SRCS+= pwgets.c
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
PROG?= boot0
|
PROG?= boot0
|
||||||
STRIP=
|
STRIP=
|
||||||
BINMODE=${NOBINMODE}
|
BINMODE=${NOBINMODE}
|
||||||
MAN=
|
|
||||||
SRCS= ${PROG}.S
|
SRCS= ${PROG}.S
|
||||||
|
|
||||||
# Additional options that you can specify with make OPTS="..."
|
# Additional options that you can specify with make OPTS="..."
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
|
|
||||||
PROG= btx
|
PROG= btx
|
||||||
INTERNALPROG=
|
INTERNALPROG=
|
||||||
MAN=
|
|
||||||
SRCS= btx.S
|
SRCS= btx.S
|
||||||
|
|
||||||
.if defined(BOOT_BTX_NOHANG)
|
.if defined(BOOT_BTX_NOHANG)
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
|
|
||||||
PROG= btxldr
|
PROG= btxldr
|
||||||
INTERNALPROG=
|
INTERNALPROG=
|
||||||
MAN=
|
|
||||||
SRCS= btxldr.S
|
SRCS= btxldr.S
|
||||||
|
|
||||||
CFLAGS+=-DLOADER_ADDRESS=${LOADER_ADDRESS}
|
CFLAGS+=-DLOADER_ADDRESS=${LOADER_ADDRESS}
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
|
|
||||||
PROG= crt0.o
|
PROG= crt0.o
|
||||||
INTERNALPROG=
|
INTERNALPROG=
|
||||||
MAN=
|
|
||||||
SRCS= btxcsu.S btxsys.s btxv86.s
|
SRCS= btxcsu.S btxsys.s btxv86.s
|
||||||
CFLAGS+=-I${BOOTSRC}/i386/common
|
CFLAGS+=-I${BOOTSRC}/i386/common
|
||||||
LDFLAGS+=-Wl,-r
|
LDFLAGS+=-Wl,-r
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
PROG= cdboot
|
PROG= cdboot
|
||||||
STRIP=
|
STRIP=
|
||||||
BINMODE=${NOBINMODE}
|
BINMODE=${NOBINMODE}
|
||||||
MAN=
|
|
||||||
SRCS= ${PROG}.S
|
SRCS= ${PROG}.S
|
||||||
|
|
||||||
CFLAGS+=-I${BOOTSRC}/i386/common
|
CFLAGS+=-I${BOOTSRC}/i386/common
|
||||||
|
@ -6,7 +6,6 @@ PROG= kgzldr.o
|
|||||||
STRIP=
|
STRIP=
|
||||||
BINMODE=${LIBMODE}
|
BINMODE=${LIBMODE}
|
||||||
BINDIR= ${LIBDIR}
|
BINDIR= ${LIBDIR}
|
||||||
MAN=
|
|
||||||
|
|
||||||
SRCS= start.s boot.c inflate.c lib.c crt.s sio.s
|
SRCS= start.s boot.c inflate.c lib.c crt.s sio.s
|
||||||
CFLAGS= -Os
|
CFLAGS= -Os
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
|
|
||||||
LIB= firewire
|
LIB= firewire
|
||||||
INTERNALLIB=
|
|
||||||
|
|
||||||
.PATH: ${SYSDIR}/dev/dcons ${SYSDIR}/dev/firewire
|
.PATH: ${SYSDIR}/dev/dcons ${SYSDIR}/dev/firewire
|
||||||
SRCS+= firewire.c fwohci.c dconsole.c
|
SRCS+= firewire.c fwohci.c dconsole.c
|
||||||
|
@ -5,7 +5,6 @@ HAVE_GELI= yes
|
|||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
|
|
||||||
LIB= i386
|
LIB= i386
|
||||||
INTERNALLIB=
|
|
||||||
|
|
||||||
SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
|
SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
|
||||||
biospci.c biossmap.c bootinfo.c bootinfo32.c bootinfo64.c \
|
biospci.c biossmap.c bootinfo.c bootinfo32.c bootinfo64.c \
|
||||||
|
@ -14,11 +14,8 @@ LOADER_BZIP2_SUPPORT?= yes
|
|||||||
|
|
||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
|
|
||||||
MK_SSP= no
|
|
||||||
|
|
||||||
LOADER?= loader
|
LOADER?= loader
|
||||||
PROG= ${LOADER}.sym
|
PROG= ${LOADER}.sym
|
||||||
MAN=
|
|
||||||
INTERNALPROG=
|
INTERNALPROG=
|
||||||
NEWVERSWHAT?= "bootstrap loader" x86
|
NEWVERSWHAT?= "bootstrap loader" x86
|
||||||
VERSION_FILE= ${.CURDIR}/../loader/version
|
VERSION_FILE= ${.CURDIR}/../loader/version
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
PROG= mbr
|
PROG= mbr
|
||||||
STRIP=
|
STRIP=
|
||||||
BINMODE=${NOBINMODE}
|
BINMODE=${NOBINMODE}
|
||||||
MAN=
|
|
||||||
SRCS= ${PROG}.s
|
SRCS= ${PROG}.s
|
||||||
|
|
||||||
# MBR flags: 0x80 -- try packet interface (also known as EDD or LBA)
|
# MBR flags: 0x80 -- try packet interface (also known as EDD or LBA)
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
PROG= pmbr
|
PROG= pmbr
|
||||||
STRIP=
|
STRIP=
|
||||||
BINMODE=${NOBINMODE}
|
BINMODE=${NOBINMODE}
|
||||||
MAN=
|
|
||||||
SRCS= ${PROG}.s
|
SRCS= ${PROG}.s
|
||||||
|
|
||||||
ORG= 0x600
|
ORG= 0x600
|
||||||
|
@ -6,17 +6,12 @@
|
|||||||
# quite large.
|
# quite large.
|
||||||
#
|
#
|
||||||
|
|
||||||
MK_PROFILE= no
|
|
||||||
MK_SSP= no
|
|
||||||
|
|
||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
|
|
||||||
INTERNALLIB=
|
|
||||||
LIBSA_CPUARCH?=${MACHINE_CPUARCH}
|
LIBSA_CPUARCH?=${MACHINE_CPUARCH}
|
||||||
LIBC_SRC= ${SRCTOP}/lib/libc
|
LIBC_SRC= ${SRCTOP}/lib/libc
|
||||||
|
|
||||||
LIB?= sa
|
LIB?= sa
|
||||||
NO_PIC=
|
|
||||||
|
|
||||||
# standalone components and stuff we have modified locally
|
# standalone components and stuff we have modified locally
|
||||||
SRCS+= gzguts.h zutil.h __main.c abort.c assert.c bcd.c environment.c getopt.c gets.c \
|
SRCS+= gzguts.h zutil.h __main.c abort.c assert.c bcd.c environment.c getopt.c gets.c \
|
||||||
|
@ -43,8 +43,6 @@ SRCS= relocate.S \
|
|||||||
cfi.c \
|
cfi.c \
|
||||||
sdcard.c
|
sdcard.c
|
||||||
|
|
||||||
MAN=
|
|
||||||
|
|
||||||
AFLAGS= -G0
|
AFLAGS= -G0
|
||||||
|
|
||||||
CFLAGS+= -I${LDRSRC} \
|
CFLAGS+= -I${LDRSRC} \
|
||||||
|
@ -38,9 +38,6 @@ LOADER_BZIP2_SUPPORT?= yes
|
|||||||
|
|
||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
|
|
||||||
MK_SSP= no
|
|
||||||
MAN=
|
|
||||||
|
|
||||||
PROG?= loader
|
PROG?= loader
|
||||||
NEWVERSWHAT= "BERI loader" ${MACHINE_CPUARCH}
|
NEWVERSWHAT= "BERI loader" ${MACHINE_CPUARCH}
|
||||||
INSTALLFLAGS= -b
|
INSTALLFLAGS= -b
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
|
|
||||||
LIB= ofw
|
LIB= ofw
|
||||||
INTERNALLIB=
|
|
||||||
|
|
||||||
SRCS= devicename.c elf_freebsd.c ofw_console.c ofw_copy.c ofw_disk.c \
|
SRCS= devicename.c elf_freebsd.c ofw_console.c ofw_copy.c ofw_disk.c \
|
||||||
ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \
|
ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \
|
||||||
|
@ -9,8 +9,6 @@ INSTALLFLAGS= -b
|
|||||||
FILES= boot1.hfs
|
FILES= boot1.hfs
|
||||||
SRCS= boot1.c ashldi3.c syncicache.c
|
SRCS= boot1.c ashldi3.c syncicache.c
|
||||||
|
|
||||||
MAN=
|
|
||||||
|
|
||||||
CFLAGS+=-I${LDRSRC}
|
CFLAGS+=-I${LDRSRC}
|
||||||
LDFLAGS=-nostdlib -static -Wl,-N
|
LDFLAGS=-nostdlib -static -Wl,-N
|
||||||
|
|
||||||
|
@ -11,8 +11,6 @@ LOADER_GZIP_SUPPORT?= yes
|
|||||||
LOADER_BZIP2_SUPPORT?= no
|
LOADER_BZIP2_SUPPORT?= no
|
||||||
|
|
||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
MK_SSP= no
|
|
||||||
MAN=
|
|
||||||
|
|
||||||
PROG= loader.kboot
|
PROG= loader.kboot
|
||||||
NEWVERSWHAT= "kboot loader" ${MACHINE_ARCH}
|
NEWVERSWHAT= "kboot loader" ${MACHINE_ARCH}
|
||||||
|
@ -11,8 +11,6 @@ LOADER_GZIP_SUPPORT?= yes
|
|||||||
LOADER_BZIP2_SUPPORT?= no
|
LOADER_BZIP2_SUPPORT?= no
|
||||||
|
|
||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
MK_SSP= no
|
|
||||||
MAN=
|
|
||||||
|
|
||||||
PROG= loader
|
PROG= loader
|
||||||
NEWVERSWHAT= "Open Firmware loader" ${MACHINE_ARCH}
|
NEWVERSWHAT= "Open Firmware loader" ${MACHINE_ARCH}
|
||||||
|
@ -14,7 +14,6 @@ LOADER_BZIP2_SUPPORT?= no
|
|||||||
PROG= ubldr
|
PROG= ubldr
|
||||||
NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH}
|
NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH}
|
||||||
INSTALLFLAGS= -b
|
INSTALLFLAGS= -b
|
||||||
MAN=
|
|
||||||
|
|
||||||
# Architecture-specific loader code
|
# Architecture-specific loader code
|
||||||
SRCS= start.S conf.c vers.c
|
SRCS= start.S conf.c vers.c
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
|
|
||||||
PROG= boot1.elf
|
PROG= boot1.elf
|
||||||
INTERNALPROG=
|
INTERNALPROG=
|
||||||
MAN=
|
|
||||||
FILES?= boot1
|
FILES?= boot1
|
||||||
SRCS= _start.s boot1.c
|
SRCS= _start.s boot1.c
|
||||||
CLEANFILES+=${FILES} boot1.aout
|
CLEANFILES+=${FILES} boot1.aout
|
||||||
|
@ -13,8 +13,6 @@ LOADER_BZIP2_SUPPORT?= no
|
|||||||
LOADER_DEBUG?= no
|
LOADER_DEBUG?= no
|
||||||
|
|
||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
MK_SSP= no
|
|
||||||
MAN=
|
|
||||||
|
|
||||||
PROG?= loader
|
PROG?= loader
|
||||||
NEWVERSWHAT?= "bootstrap loader" sparc64
|
NEWVERSWHAT?= "bootstrap loader" sparc64
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
.PATH: ${LDRSRC}
|
.PATH: ${LDRSRC}
|
||||||
|
|
||||||
LIB= uboot_fdt
|
LIB= uboot_fdt
|
||||||
INTERNALLIB=
|
|
||||||
WARNS?= 2
|
WARNS?= 2
|
||||||
|
|
||||||
SRCS= uboot_fdt.c
|
SRCS= uboot_fdt.c
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
.PATH: ${LDRSRC}
|
.PATH: ${LDRSRC}
|
||||||
|
|
||||||
LIB= uboot
|
LIB= uboot
|
||||||
INTERNALLIB=
|
|
||||||
WARNS?= 2
|
WARNS?= 2
|
||||||
|
|
||||||
SRCS= console.c copy.c devicename.c elf_freebsd.c glue.c
|
SRCS= console.c copy.c devicename.c elf_freebsd.c glue.c
|
||||||
|
@ -32,7 +32,6 @@
|
|||||||
.PATH: ${.CURDIR}
|
.PATH: ${.CURDIR}
|
||||||
|
|
||||||
PROG= usbloader
|
PROG= usbloader
|
||||||
MAN=
|
|
||||||
SRCS=
|
SRCS=
|
||||||
|
|
||||||
CFLAGS+= -Wall
|
CFLAGS+= -Wall
|
||||||
|
@ -1,10 +1,6 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
|
|
||||||
MAN=
|
|
||||||
|
|
||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
MK_SSP= no
|
|
||||||
|
|
||||||
PROG= test
|
PROG= test
|
||||||
INTERNALPROG=
|
INTERNALPROG=
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
MAN=
|
|
||||||
|
|
||||||
LOADER_MSDOS_SUPPORT?= yes
|
LOADER_MSDOS_SUPPORT?= yes
|
||||||
LOADER_UFS_SUPPORT?= yes
|
LOADER_UFS_SUPPORT?= yes
|
||||||
LOADER_CD9660_SUPPORT?= no
|
LOADER_CD9660_SUPPORT?= no
|
||||||
@ -9,10 +7,7 @@ LOADER_EXT2FS_SUPPORT?= no
|
|||||||
|
|
||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
|
|
||||||
MK_SSP= no
|
|
||||||
|
|
||||||
SHLIB_NAME= userboot.so
|
SHLIB_NAME= userboot.so
|
||||||
MK_CTF= no
|
|
||||||
STRIP=
|
STRIP=
|
||||||
LIBDIR= /boot
|
LIBDIR= /boot
|
||||||
|
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
|
|
||||||
LIB= zfsboot
|
LIB= zfsboot
|
||||||
INTERNALLIB=
|
|
||||||
|
|
||||||
.PATH: ${ZFSSRC}
|
.PATH: ${ZFSSRC}
|
||||||
SRCS+= zfs.c skein.c skein_block.c
|
SRCS+= zfs.c skein.c skein_block.c
|
||||||
|
Loading…
Reference in New Issue
Block a user