From 6b9f688352c672850ed67ad2a31788d3ff024f5d Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Mon, 16 Oct 2017 03:59:44 +0000 Subject: Move all the ficl common code into ficl.mk There's a number of copies of basically identical code to enable building forth in /boot/loader. Move it all into ficl.mk. --- sys/boot/efi/boot1/Makefile | 1 + sys/boot/efi/libefi/Makefile | 1 - sys/boot/efi/loader/Makefile | 8 -------- 3 files changed, 1 insertion(+), 9 deletions(-) (limited to 'sys/boot/efi') diff --git a/sys/boot/efi/boot1/Makefile b/sys/boot/efi/boot1/Makefile index 6375a796886f..2018e776a02e 100644 --- a/sys/boot/efi/boot1/Makefile +++ b/sys/boot/efi/boot1/Makefile @@ -5,6 +5,7 @@ MAN= .include "../Makefile.inc" MK_SSP= no +MK_FORTH= no PROG= boot1.sym INTERNALPROG= diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile index e94098616359..6f3c17236a9b 100644 --- a/sys/boot/efi/libefi/Makefile +++ b/sys/boot/efi/libefi/Makefile @@ -3,7 +3,6 @@ .include .if ${MK_FORTH} != "no" -CFLAGS+= -DBOOT_FORTH .include "../../ficl.mk" .endif diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile index 006e544f19e3..2b3aa2b31d84 100644 --- a/sys/boot/efi/loader/Makefile +++ b/sys/boot/efi/loader/Makefile @@ -78,14 +78,6 @@ CFLAGS+= -DSMBIOS_NETWORK_ENDIAN_UUID .endif .endif -.if ${MK_FORTH} != "no" -BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -CFLAGS+= -I${.CURDIR}/../../ficl -CFLAGS+= -I${.CURDIR}/../../ficl/${MACHINE_CPUARCH} -LIBFICL= ${.OBJDIR}/../../ficl/libficl.a -.endif - LOADER_FDT_SUPPORT?= no .if ${MK_FDT} != "no" && ${LOADER_FDT_SUPPORT} != "no" CFLAGS+= -I${.CURDIR}/../../fdt -- cgit v1.2.3