d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rather than laying whack-a-mole with including the path to stand.h,

Browse Source 
always include it. Remove places where we explicitly include it. This
also helps reduce the 'cut-and-paste' factor of these Makefiles.

Sponsored by: Netflix
This commit is contained in:
Warner Losh 2017-10-10 01:31:44 +00:00
parent 009ad5724d
commit b9b9a7c3a2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=324460
24 changed files with 3 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/boot/Makefile.ficl
View File

@ -27,7 +27,7 @@ CFLAGS+= -m32 -mcpu=powerpc -I.
.endif
CFLAGS+= -I${FICLDIR} -I${FICLDIR}/${FICL_CPUARCH} \
-I${FICLDIR}/../common -I${SASRC}
-I${FICLDIR}/../common
.if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32)
.if !exists(machine)

2
sys/boot/Makefile.inc
View File

@ -13,6 +13,8 @@ LIBSA32=${OBJTOP}/sys/boot/libstand32/libstand.a
# stand along library compiled for userboot
LIBSAU=${OBJTOP}/sys/boot/userboot/libstand/libstand.a
CFLAGS+=-I${SASRC}
SSP_CFLAGS=
.if ${MACHINE_CPUARCH} == "arm"

2
sys/boot/arm/uboot/Makefile
View File

@ -112,8 +112,6 @@ LIBUBOOT= ${.OBJDIR}/../../uboot/lib/libuboot.a
CFLAGS+= -I${.CURDIR}/../../uboot/lib
CFLAGS+= -I${.OBJDIR}/../../uboot/lib
CFLAGS+= -I${SASRC}
CFLAGS+= -fPIC
# clang doesn't understand %D as a specifier to printf

1
sys/boot/common/Makefile.inc
View File

@ -70,7 +70,6 @@ CFLAGS+= -DBOOT_PROMPT_123
.if defined(LOADER_INSTALL_SUPPORT)
SRCS+= install.c
CFLAGS+=-I${SASRC}
.endif
CLEANFILES+= vers.c

2
sys/boot/efi/fdt/Makefile
View File

@ -17,8 +17,6 @@ CFLAGS+= -mgeneral-regs-only
CFLAGS+= -msoft-float
.endif
CFLAGS+= -I${SASRC}
# EFI library headers
CFLAGS+= -I${.CURDIR}/../include
CFLAGS+= -I${.CURDIR}/../include/${MACHINE}

1
sys/boot/efi/libefi/Makefile
View File

@ -37,7 +37,6 @@ CFLAGS+= -fPIC -mno-red-zone
.endif
CFLAGS+= -I${.CURDIR}/../include
CFLAGS+= -I${.CURDIR}/../include/${MACHINE}
CFLAGS+= -I${SASRC}
.if ${MK_ZFS} != "no"
CFLAGS+= -I${.CURDIR}/../../zfs
CFLAGS+= -I${.CURDIR}/../../../cddl/boot/zfs

4
sys/boot/efi/loader/Makefile
View File

@ -36,10 +36,6 @@ CWARNFLAGS.zfs.c+= -Wno-array-bounds
CWARNFLAGS.zfs.c+= -Wno-missing-prototypes
.endif
.if defined(LOADER_NET_SUPPORT)
CFLAGS+= -I${SASRC}
.endif
.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} > 40201
CWARNFLAGS.self_reloc.c+= -Wno-error=maybe-uninitialized
.endif

1
sys/boot/fdt/Makefile
View File

@ -12,7 +12,6 @@ SRCS+= fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c \
# Loader's fdt commands extension sources.
SRCS+= fdt_loader_cmd.c fdt_overlay.c
CFLAGS+= -I${SASRC}
CFLAGS+= -I${.CURDIR}/../../contrib/libfdt/ -I${.CURDIR}/../common/
CFLAGS+= -ffreestanding

1
sys/boot/i386/libfirewire/Makefile
View File

@ -10,7 +10,6 @@ SRCS+= dcons.c fwcrom.c
CFLAGS+= -D_BOOT
CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
CFLAGS+= -I${SASRC}
CFLAGS+= -I${.CURDIR}/../btx/lib
CFLAGS+= -I${.CURDIR}/../libi386

2
sys/boot/i386/libi386/Makefile
View File

@ -59,8 +59,6 @@ CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386 \
-I${.CURDIR}/../btx/lib \
-I${.CURDIR}/../../../contrib/dev/acpica/include \
-I${.CURDIR}/../../.. -I.
# the location of libstand
CFLAGS+= -I${SASRC}
# Handle FreeBSD specific %b and %D printf format specifiers
CFLAGS+= ${FORMAT_EXTENSIONS}

4
sys/boot/i386/loader/Makefile
View File

@ -28,10 +28,6 @@ CFLAGS+= -DLOADER_ZFS_SUPPORT
LIBZFSBOOT= ${.OBJDIR}/../../zfs/libzfsboot.a
.endif
.if defined(LOADER_NET_SUPPORT)
CFLAGS+= -I${SASRC}
.endif
.if defined(LOADER_TFTP_SUPPORT)
CFLAGS+= -DLOADER_TFTP_SUPPORT
.endif

3
sys/boot/mips/beri/boot2/Makefile
View File

@ -57,9 +57,6 @@ CFLAGS= -ffreestanding \
-msoft-float \
-g
# where to get libstand from
CFLAGS+= -I${SASRC}
LDFLAGS= -nostdlib \
-static \
-Wl,-N \

3
sys/boot/mips/beri/loader/Makefile
View File

@ -107,9 +107,6 @@ LDFLAGS= -nostdlib \
-L${.CURDIR} \
-e __start
# where to get libstand from
CFLAGS+= -I${SASRC}
DPADD= ${LIBFICL} ${LIBSA}
LDADD= ${LIBFICL} ${LIBSA}

3
sys/boot/mips/uboot/Makefile
View File

@ -115,9 +115,6 @@ LIBUBOOT= ${.OBJDIR}/../../uboot/lib/libuboot.a
CFLAGS+= -I${.CURDIR}/../../uboot/lib
CFLAGS+= -I${.OBJDIR}/../../uboot/lib
# where to get libstand from
CFLAGS+= -I${SASRC}
# clang doesn't understand %D as a specifier to printf
#NO_WERROR.clang=
#NO_WERROR=

2
sys/boot/ofw/libofw/Makefile
View File

@ -9,8 +9,6 @@ SRCS= devicename.c elf_freebsd.c ofw_console.c ofw_copy.c ofw_disk.c \
.PATH: ${.CURDIR}/../../zfs
SRCS+= devicename_stubs.c
CFLAGS+= -I${SASRC}
# Pick up the bootstrap header for some interface items
CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.

3
sys/boot/powerpc/kboot/Makefile
View File

@ -93,9 +93,6 @@ CFLAGS+= -Wa,-mppc64bridge
#.PATH: ${.CURDIR}/../../ofw/common
#.include "${.CURDIR}/../../ofw/common/Makefile.inc"
# where to get libstand from
CFLAGS+= -I${SASRC}
DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}

3
sys/boot/powerpc/ofw/Makefile
View File

@ -91,9 +91,6 @@ LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a
CFLAGS+= -I${.CURDIR}/../../ofw/libofw
# where to get libstand from
CFLAGS+= -I${SASRC}
DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}

3
sys/boot/powerpc/ps3/Makefile
View File

@ -90,9 +90,6 @@ LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
#.PATH: ${.CURDIR}/../../ofw/common
#.include "${.CURDIR}/../../ofw/common/Makefile.inc"
# where to get libstand from
CFLAGS+= -I${SASRC}
DPADD= ${LIBFICL} ${LIBOFW} ${LIBSA32}
LDADD= ${LIBFICL} ${LIBOFW} ${LIBSA32}

3
sys/boot/powerpc/uboot/Makefile
View File

@ -96,9 +96,6 @@ LIBUBOOT= ${.OBJDIR}/../../uboot/lib/libuboot.a
CFLAGS+= -I${.CURDIR}/../../uboot/lib
CFLAGS+= -I${.OBJDIR}/../../uboot/lib
# where to get libstand from
CFLAGS+= -I${SASRC}
DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA32}
LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA32}

3
sys/boot/sparc64/loader/Makefile
View File

@ -79,9 +79,6 @@ LDFLAGS= -static
LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a
CFLAGS+= -I${.CURDIR}/../../ofw/libofw/
# where to get libstand from
CFLAGS+= -I${SASRC}
# Need sys/ for crypto/intake.h
CFLAGS+= -I${SRCTOP}/sys

2
sys/boot/uboot/fdt/Makefile
View File

@ -12,8 +12,6 @@ SRCS= uboot_fdt.c
CFLAGS+= -ffreestanding -msoft-float
CFLAGS+= -I${SASRC}
# U-Boot library headers
CFLAGS+= -I${.CURDIR}/../lib

2
sys/boot/uboot/lib/Makefile
View File

@ -13,8 +13,6 @@ SRCS+= module.c net.c reboot.c time.c
CFLAGS+= -ffreestanding -msoft-float
CFLAGS+= -I${SASRC}
.if !defined(LOADER_NO_DISK_SUPPORT)
SRCS+= disk.c
CFLAGS+= -DLOADER_DISK_SUPPORT

1
sys/boot/userboot/userboot/Makefile
View File

@ -32,7 +32,6 @@ CFLAGS+= -Wall
CFLAGS+= -I${.CURDIR}/..
CFLAGS+= -I${.CURDIR}/../../common
CFLAGS+= -I${.CURDIR}/../../..
CFLAGS+= -I${SASRC}
CFLAGS+= -ffreestanding -I.
CWARNFLAGS.main.c += -Wno-implicit-function-declaration

1
sys/boot/zfs/Makefile
View File

@ -12,7 +12,6 @@ CFLAGS+= -DSKEIN_LOOP=111
CFLAGS+= -DBOOTPROG=\"zfsloader\"
CFLAGS+= -I${.CURDIR}/../common -I${.CURDIR}/../.. -I.
CFLAGS+= -I${SASRC}
CFLAGS+= -I${.CURDIR}/../../cddl/boot/zfs
CFLAGS+= -I${.CURDIR}/../../crypto/skein