svn commit: r314922 - in stable/10/sys/boot: arm/uboot powerpc/ofw powerpc/ps3 powerpc/uboot userboot/userboot

[Pedro F. Giffuni]

Author: pfg
Date: Wed Mar  8 22:39:45 2017
New Revision: 314922
URL: https://svnweb.freebsd.org/changeset/base/314922

Log:
  MFC r314505:
  Split the ficl CFLAGS when they refer to an arch-specific include path.
  
  This is a minimal attempt to keep consistency in the Makefiles so that
  moving ficl to somwehere like contrib will be less error prone.

Modified:
  stable/10/sys/boot/arm/uboot/Makefile
  stable/10/sys/boot/powerpc/ofw/Makefile
  stable/10/sys/boot/powerpc/ps3/Makefile
  stable/10/sys/boot/powerpc/uboot/Makefile
  stable/10/sys/boot/userboot/userboot/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/arm/uboot/Makefile
==============================================================================
--- stable/10/sys/boot/arm/uboot/Makefile	Wed Mar  8 22:38:40 2017	(r314921)
+++ stable/10/sys/boot/arm/uboot/Makefile	Wed Mar  8 22:39:45 2017	(r314922)
@@ -82,7 +82,8 @@ CFLAGS+=	-DNETIF_OPEN_CLOSE_ONCE
 .if ${MK_FORTH} != "no"
 # Enable BootForth
 BOOT_FORTH=	yes
-CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/arm
+CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl
+CFLAGS+=	-I${.CURDIR}/../../ficl/arm
 LIBFICL=	${.OBJDIR}/../../ficl/libficl.a
 .endif
 

Modified: stable/10/sys/boot/powerpc/ofw/Makefile
==============================================================================
--- stable/10/sys/boot/powerpc/ofw/Makefile	Wed Mar  8 22:38:40 2017	(r314921)
+++ stable/10/sys/boot/powerpc/ofw/Makefile	Wed Mar  8 22:39:45 2017	(r314922)
@@ -53,7 +53,8 @@ CFLAGS+=	-DLOADER_TFTP_SUPPORT
 .if ${MK_FORTH} != "no"
 # Enable BootForth
 BOOT_FORTH=	yes
-CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc
+CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl
+CFLAGS+=	-I${.CURDIR}/../../ficl/powerpc
 LIBFICL=	${.OBJDIR}/../../ficl/libficl.a
 .endif
 

Modified: stable/10/sys/boot/powerpc/ps3/Makefile
==============================================================================
--- stable/10/sys/boot/powerpc/ps3/Makefile	Wed Mar  8 22:38:40 2017	(r314921)
+++ stable/10/sys/boot/powerpc/ps3/Makefile	Wed Mar  8 22:39:45 2017	(r314922)
@@ -63,7 +63,8 @@ LIBFDT=		${.OBJDIR}/../../fdt/libfdt.a
 .if ${MK_FORTH} != "no"
 # Enable BootForth
 BOOT_FORTH=	yes
-CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc
+CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl
+CFLAGS+=	-I${.CURDIR}/../../ficl/powerpc
 LIBFICL=	${.OBJDIR}/../../ficl/libficl.a
 .endif
 

Modified: stable/10/sys/boot/powerpc/uboot/Makefile
==============================================================================
--- stable/10/sys/boot/powerpc/uboot/Makefile	Wed Mar  8 22:38:40 2017	(r314921)
+++ stable/10/sys/boot/powerpc/uboot/Makefile	Wed Mar  8 22:39:45 2017	(r314922)
@@ -69,7 +69,8 @@ LIBFDT=		${.OBJDIR}/../../fdt/libfdt.a
 .if ${MK_FORTH} != "no"
 # Enable BootForth
 BOOT_FORTH=	yes
-CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc
+CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl
+CFLAGS+=	-I${.CURDIR}/../../ficl/powerpc
 LIBFICL=	${.OBJDIR}/../../ficl/libficl.a
 .endif
 

Modified: stable/10/sys/boot/userboot/userboot/Makefile
==============================================================================
--- stable/10/sys/boot/userboot/userboot/Makefile	Wed Mar  8 22:38:40 2017	(r314921)
+++ stable/10/sys/boot/userboot/userboot/Makefile	Wed Mar  8 22:39:45 2017	(r314922)
@@ -45,7 +45,8 @@ CLEANFILES=	vers.c
 
 .if ${MK_FORTH} != "no"
 BOOT_FORTH=	yes
-CFLAGS+=        -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386
+CFLAGS+=        -DBOOT_FORTH -I${.CURDIR}/../../ficl
+CFLAGS+=        -I${.CURDIR}/../../ficl/i386
 CFLAGS+=	-DBF_DICTSIZE=15000
 LIBFICL=	${.OBJDIR}/../ficl/libficl.a
 LIBSTAND=	${.OBJDIR}/../libstand/libstand.a