Author: imp
Date: Fri Feb 2 06:32:26 2018
New Revision: 328769
URL: https://svnweb.freebsd.org/changeset/base/328769
Log:
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.
Modified:
head/stand/defs.mk
head/stand/efi/boot1/Makefile
head/stand/efi/fdt/Makefile
head/stand/efi/libefi/Makefile
head/stand/efi/loader/Makefile
head/stand/fdt/Makefile
head/stand/ficl/Makefile
head/stand/geli/Makefile
head/stand/i386/boot0/Makefile
head/stand/i386/btx/btx/Makefile
head/stand/i386/btx/btxldr/Makefile
head/stand/i386/btx/lib/Makefile
head/stand/i386/cdboot/Makefile
head/stand/i386/kgzldr/Makefile
head/stand/i386/libfirewire/Makefile
head/stand/i386/libi386/Makefile
head/stand/i386/loader/Makefile
head/stand/i386/mbr/Makefile
head/stand/i386/pmbr/Makefile
head/stand/libsa/Makefile
head/stand/mips/beri/boot2/Makefile
head/stand/mips/beri/loader/Makefile
head/stand/ofw/libofw/Makefile
head/stand/powerpc/boot1.chrp/Makefile
head/stand/powerpc/kboot/Makefile
head/stand/powerpc/ofw/Makefile
head/stand/powerpc/uboot/Makefile
head/stand/sparc64/boot1/Makefile
head/stand/sparc64/loader/Makefile
head/stand/uboot/fdt/Makefile
head/stand/uboot/lib/Makefile
head/stand/usb/Makefile.test
head/stand/userboot/test/Makefile
head/stand/userboot/userboot/Makefile
head/stand/zfs/Makefile
Modified: head/stand/defs.mk
==============================================================================
--- head/stand/defs.mk Fri Feb 2 05:04:43 2018 (r328768)
+++ head/stand/defs.mk Fri Feb 2 06:32:26 2018 (r328769)
@@ -7,6 +7,13 @@ WARNS?=1
.if !defined(__BOOT_DEFS_MK__)
__BOOT_DEFS_MK__=${MFILE}
+MK_CTF= no
+MK_SSP= no
+MK_PROFILE= no
+NO_PIC=
+MAN=
+INTERNALLIB=
+
BOOTSRC= ${SRCTOP}/stand
EFISRC= ${BOOTSRC}/efi
EFIINC= ${EFISRC}/include
Modified: head/stand/efi/boot1/Makefile
==============================================================================
--- head/stand/efi/boot1/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/efi/boot1/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -1,11 +1,6 @@
# $FreeBSD$
-MAN=
-
.include <bsd.init.mk>
-
-MK_SSP= no
-MK_FORTH= no
PROG= boot1.sym
INTERNALPROG=
Modified: head/stand/efi/fdt/Makefile
==============================================================================
--- head/stand/efi/fdt/Makefile Fri Feb 2 05:04:43 2018 (r328768)
+++ head/stand/efi/fdt/Makefile Fri Feb 2 06:32:26 2018 (r328769)
@@ -5,7 +5,6 @@
.PATH: ${LDRSRC}
LIB= efi_fdt
-INTERNALLIB=
WARNS?= 6
SRCS= efi_fdt.c
Modified: head/stand/efi/libefi/Makefile
==============================================================================
--- head/stand/efi/libefi/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/efi/libefi/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -7,7 +7,6 @@
.endif
LIB= efi
-INTERNALLIB=
WARNS?= 2
SRCS= delay.c devpath.c efi_console.c efichar.c efinet.c efipart.c env.c
errno.c \
Modified: head/stand/efi/loader/Makefile
==============================================================================
--- head/stand/efi/loader/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/efi/loader/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -1,7 +1,5 @@
# $FreeBSD$
-MAN=
-
LOADER_NET_SUPPORT?= yes
LOADER_MSDOS_SUPPORT?= yes
LOADER_UFS_SUPPORT?= yes
@@ -9,8 +7,6 @@ LOADER_CD9660_SUPPORT?= no
LOADER_EXT2FS_SUPPORT?= no
.include <bsd.init.mk>
-
-MK_SSP= no
PROG= loader.sym
INTERNALPROG=
Modified: head/stand/fdt/Makefile
==============================================================================
--- head/stand/fdt/Makefile Fri Feb 2 05:04:43 2018 (r328768)
+++ head/stand/fdt/Makefile Fri Feb 2 06:32:26 2018 (r328769)
@@ -5,7 +5,6 @@
.PATH: ${SYSDIR}/contrib/libfdt/
LIB= fdt
-INTERNALLIB=
# Vendor sources of libfdt.
SRCS+= fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c \
Modified: head/stand/ficl/Makefile
==============================================================================
--- head/stand/ficl/Makefile Fri Feb 2 05:04:43 2018 (r328768)
+++ head/stand/ficl/Makefile Fri Feb 2 06:32:26 2018 (r328769)
@@ -20,7 +20,6 @@ PROG= testmain
.include <bsd.prog.mk>
.else
LIB= ficl
-INTERNALLIB=
.include <bsd.lib.mk>
.endif
Modified: head/stand/geli/Makefile
==============================================================================
--- head/stand/geli/Makefile Fri Feb 2 05:04:43 2018 (r328768)
+++ head/stand/geli/Makefile Fri Feb 2 06:32:26 2018 (r328769)
@@ -1,16 +1,11 @@
# $FreeBSD$
# libgeliboot
-MAN=
DO32=1
.include <bsd.init.mk>
-MK_SSP= no
LIB= geliboot
-INTERNALLIB=
-MK_PROFILE= no
-NO_PIC=
# Our password input method
SRCS+= pwgets.c
Modified: head/stand/i386/boot0/Makefile
==============================================================================
--- head/stand/i386/boot0/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/i386/boot0/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -3,7 +3,6 @@
PROG?= boot0
STRIP=
BINMODE=${NOBINMODE}
-MAN=
SRCS= ${PROG}.S
# Additional options that you can specify with make OPTS="..."
Modified: head/stand/i386/btx/btx/Makefile
==============================================================================
--- head/stand/i386/btx/btx/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/i386/btx/btx/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -4,7 +4,6 @@
PROG= btx
INTERNALPROG=
-MAN=
SRCS= btx.S
.if defined(BOOT_BTX_NOHANG)
Modified: head/stand/i386/btx/btxldr/Makefile
==============================================================================
--- head/stand/i386/btx/btxldr/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/i386/btx/btxldr/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -4,7 +4,6 @@
PROG= btxldr
INTERNALPROG=
-MAN=
SRCS= btxldr.S
CFLAGS+=-DLOADER_ADDRESS=${LOADER_ADDRESS}
Modified: head/stand/i386/btx/lib/Makefile
==============================================================================
--- head/stand/i386/btx/lib/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/i386/btx/lib/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -4,7 +4,6 @@
PROG= crt0.o
INTERNALPROG=
-MAN=
SRCS= btxcsu.S btxsys.s btxv86.s
CFLAGS+=-I${BOOTSRC}/i386/common
LDFLAGS+=-Wl,-r
Modified: head/stand/i386/cdboot/Makefile
==============================================================================
--- head/stand/i386/cdboot/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/i386/cdboot/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -5,7 +5,6 @@
PROG= cdboot
STRIP=
BINMODE=${NOBINMODE}
-MAN=
SRCS= ${PROG}.S
CFLAGS+=-I${BOOTSRC}/i386/common
Modified: head/stand/i386/kgzldr/Makefile
==============================================================================
--- head/stand/i386/kgzldr/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/i386/kgzldr/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -6,7 +6,6 @@ PROG= kgzldr.o
STRIP=
BINMODE=${LIBMODE}
BINDIR= ${LIBDIR}
-MAN=
SRCS= start.s boot.c inflate.c lib.c crt.s sio.s
CFLAGS= -Os
Modified: head/stand/i386/libfirewire/Makefile
==============================================================================
--- head/stand/i386/libfirewire/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/i386/libfirewire/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -3,7 +3,6 @@
.include <bsd.init.mk>
LIB= firewire
-INTERNALLIB=
.PATH: ${SYSDIR}/dev/dcons ${SYSDIR}/dev/firewire
SRCS+= firewire.c fwohci.c dconsole.c
Modified: head/stand/i386/libi386/Makefile
==============================================================================
--- head/stand/i386/libi386/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/i386/libi386/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -5,7 +5,6 @@ HAVE_GELI= yes
.include <bsd.init.mk>
LIB= i386
-INTERNALLIB=
SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
biospci.c biossmap.c bootinfo.c bootinfo32.c bootinfo64.c \
Modified: head/stand/i386/loader/Makefile
==============================================================================
--- head/stand/i386/loader/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/i386/loader/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -14,11 +14,8 @@ LOADER_BZIP2_SUPPORT?= yes
.include <bsd.init.mk>
-MK_SSP= no
-
LOADER?= loader
PROG= ${LOADER}.sym
-MAN=
INTERNALPROG=
NEWVERSWHAT?= "bootstrap loader" x86
VERSION_FILE= ${.CURDIR}/../loader/version
Modified: head/stand/i386/mbr/Makefile
==============================================================================
--- head/stand/i386/mbr/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/i386/mbr/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -3,7 +3,6 @@
PROG= mbr
STRIP=
BINMODE=${NOBINMODE}
-MAN=
SRCS= ${PROG}.s
# MBR flags: 0x80 -- try packet interface (also known as EDD or LBA)
Modified: head/stand/i386/pmbr/Makefile
==============================================================================
--- head/stand/i386/pmbr/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/i386/pmbr/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -3,7 +3,6 @@
PROG= pmbr
STRIP=
BINMODE=${NOBINMODE}
-MAN=
SRCS= ${PROG}.s
ORG= 0x600
Modified: head/stand/libsa/Makefile
==============================================================================
--- head/stand/libsa/Makefile Fri Feb 2 05:04:43 2018 (r328768)
+++ head/stand/libsa/Makefile Fri Feb 2 06:32:26 2018 (r328769)
@@ -6,17 +6,12 @@
# quite large.
#
-MK_PROFILE= no
-MK_SSP= no
-
.include <bsd.init.mk>
-INTERNALLIB=
LIBSA_CPUARCH?=${MACHINE_CPUARCH}
LIBC_SRC= ${SRCTOP}/lib/libc
LIB?= sa
-NO_PIC=
# 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 \
Modified: head/stand/mips/beri/boot2/Makefile
==============================================================================
--- head/stand/mips/beri/boot2/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/mips/beri/boot2/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -43,8 +43,6 @@ SRCS= relocate.S \
cfi.c \
sdcard.c
-MAN=
-
AFLAGS= -G0
CFLAGS+= -I${LDRSRC} \
Modified: head/stand/mips/beri/loader/Makefile
==============================================================================
--- head/stand/mips/beri/loader/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/mips/beri/loader/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -38,9 +38,6 @@ LOADER_BZIP2_SUPPORT?= yes
.include <bsd.init.mk>
-MK_SSP= no
-MAN=
-
PROG?= loader
NEWVERSWHAT= "BERI loader" ${MACHINE_CPUARCH}
INSTALLFLAGS= -b
Modified: head/stand/ofw/libofw/Makefile
==============================================================================
--- head/stand/ofw/libofw/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/ofw/libofw/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -3,7 +3,6 @@
.include <bsd.init.mk>
LIB= ofw
-INTERNALLIB=
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 \
Modified: head/stand/powerpc/boot1.chrp/Makefile
==============================================================================
--- head/stand/powerpc/boot1.chrp/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/powerpc/boot1.chrp/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -9,8 +9,6 @@ INSTALLFLAGS= -b
FILES= boot1.hfs
SRCS= boot1.c ashldi3.c syncicache.c
-MAN=
-
CFLAGS+=-I${LDRSRC}
LDFLAGS=-nostdlib -static -Wl,-N
Modified: head/stand/powerpc/kboot/Makefile
==============================================================================
--- head/stand/powerpc/kboot/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/powerpc/kboot/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -11,8 +11,6 @@ LOADER_GZIP_SUPPORT?= yes
LOADER_BZIP2_SUPPORT?= no
.include <bsd.init.mk>
-MK_SSP= no
-MAN=
PROG= loader.kboot
NEWVERSWHAT= "kboot loader" ${MACHINE_ARCH}
Modified: head/stand/powerpc/ofw/Makefile
==============================================================================
--- head/stand/powerpc/ofw/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/powerpc/ofw/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -11,8 +11,6 @@ LOADER_GZIP_SUPPORT?= yes
LOADER_BZIP2_SUPPORT?= no
.include <bsd.init.mk>
-MK_SSP= no
-MAN=
PROG= loader
NEWVERSWHAT= "Open Firmware loader" ${MACHINE_ARCH}
Modified: head/stand/powerpc/uboot/Makefile
==============================================================================
--- head/stand/powerpc/uboot/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/powerpc/uboot/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -14,7 +14,6 @@ LOADER_BZIP2_SUPPORT?= no
PROG= ubldr
NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH}
INSTALLFLAGS= -b
-MAN=
# Architecture-specific loader code
SRCS= start.S conf.c vers.c
Modified: head/stand/sparc64/boot1/Makefile
==============================================================================
--- head/stand/sparc64/boot1/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/sparc64/boot1/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -4,7 +4,6 @@
PROG= boot1.elf
INTERNALPROG=
-MAN=
FILES?= boot1
SRCS= _start.s boot1.c
CLEANFILES+=${FILES} boot1.aout
Modified: head/stand/sparc64/loader/Makefile
==============================================================================
--- head/stand/sparc64/loader/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/sparc64/loader/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -13,8 +13,6 @@ LOADER_BZIP2_SUPPORT?= no
LOADER_DEBUG?= no
.include <bsd.init.mk>
-MK_SSP= no
-MAN=
PROG?= loader
NEWVERSWHAT?= "bootstrap loader" sparc64
Modified: head/stand/uboot/fdt/Makefile
==============================================================================
--- head/stand/uboot/fdt/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/uboot/fdt/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -5,7 +5,6 @@
.PATH: ${LDRSRC}
LIB= uboot_fdt
-INTERNALLIB=
WARNS?= 2
SRCS= uboot_fdt.c
Modified: head/stand/uboot/lib/Makefile
==============================================================================
--- head/stand/uboot/lib/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/uboot/lib/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -5,7 +5,6 @@
.PATH: ${LDRSRC}
LIB= uboot
-INTERNALLIB=
WARNS?= 2
SRCS= console.c copy.c devicename.c elf_freebsd.c glue.c
Modified: head/stand/usb/Makefile.test
==============================================================================
--- head/stand/usb/Makefile.test Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/usb/Makefile.test Fri Feb 2 06:32:26 2018
(r328769)
@@ -32,7 +32,6 @@
.PATH: ${.CURDIR}
PROG= usbloader
-MAN=
SRCS=
CFLAGS+= -Wall
Modified: head/stand/userboot/test/Makefile
==============================================================================
--- head/stand/userboot/test/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/userboot/test/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -1,10 +1,6 @@
# $FreeBSD$
-
-MAN=
-
.include <bsd.init.mk>
-MK_SSP= no
PROG= test
INTERNALPROG=
Modified: head/stand/userboot/userboot/Makefile
==============================================================================
--- head/stand/userboot/userboot/Makefile Fri Feb 2 05:04:43 2018
(r328768)
+++ head/stand/userboot/userboot/Makefile Fri Feb 2 06:32:26 2018
(r328769)
@@ -1,7 +1,5 @@
# $FreeBSD$
-MAN=
-
LOADER_MSDOS_SUPPORT?= yes
LOADER_UFS_SUPPORT?= yes
LOADER_CD9660_SUPPORT?= no
@@ -9,10 +7,7 @@ LOADER_EXT2FS_SUPPORT?= no
.include <bsd.init.mk>
-MK_SSP= no
-
SHLIB_NAME= userboot.so
-MK_CTF= no
STRIP=
LIBDIR= /boot
Modified: head/stand/zfs/Makefile
==============================================================================
--- head/stand/zfs/Makefile Fri Feb 2 05:04:43 2018 (r328768)
+++ head/stand/zfs/Makefile Fri Feb 2 06:32:26 2018 (r328769)
@@ -3,7 +3,6 @@
.include <bsd.init.mk>
LIB= zfsboot
-INTERNALLIB=
.PATH: ${ZFSSRC}
SRCS+= zfs.c skein.c skein_block.c
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
