Move loader help file definitions to being 100% inside of loader.mk.

HELP_FILES is a loader only thing, so move it to loader.mk. Only generate the help file if HELP_FILES is defined. Adjust Makefiles to new convention. Fix a few cases where ${.CURDIR}/ was missing resulting in missing bits from the help files. Sponsored by: Netflix
freebsd · Dec 18, 2017 · 25c2f4c · 25c2f4c
1 parent b549627
commit 25c2f4c
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 21 deletions.
diff --git a/stand/arm/uboot/Makefile b/stand/arm/uboot/Makefile
@@ -28,7 +28,7 @@ SRCS=		start.S conf.c self_reloc.c vers.c
 CWARNFLAGS.self_reloc.c+=	-Wno-error=maybe-uninitialized
 .endif
 
-HELP_FILES+=	 help.uboot ${BOOTSRC}/fdt/help.fdt
+HELP_FILES=	 ${.CURDIR}/help.uboot ${BOOTSRC}/fdt/help.fdt
 
 # Always add MI sources
 .include	"${BOOTSRC}/loader.mk"

diff --git a/stand/defs.mk b/stand/defs.mk
@@ -170,8 +170,4 @@ ${_ILINKS}:
 	${ECHO} ${.TARGET:T} "->" $$path ; \
 	ln -fhs $$path ${.TARGET:T}
 
-# For loader implementations, we generate a loader.help file. This can be suppressed by
-# setting HELP_FILES to nothing.
-HELP_FILES=	${LDRSRC}/help.common
-
 .endif # __BOOT_DEFS_MK__
diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile
@@ -83,7 +83,6 @@ CFLAGS+=	-DEFI_STAGING_SIZE=${EFI_STAGING_SIZE}
 .endif
 
 # Always add MI sources
-HELP_FILES=
 .include	"${BOOTSRC}/loader.mk"
 
 FILES+=	loader.efi

diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile
@@ -41,9 +41,7 @@ LIBFIREWIRE=	${BOOTOBJ}/i386/libfirewire/libfirewire.a
 .endif
 
 .if exists(${.CURDIR}/help.i386)
-HELP_FILES+=	help.i386
-.else
-HELP_FILES=
+HELP_FILES=	${.CURDIR}/help.i386
 .endif
 
 # Always add MI sources

diff --git a/stand/loader.mk b/stand/loader.mk
@@ -139,6 +139,8 @@ vers.c: ${LDRSRC}/newvers.sh ${VERSION_FILE}
 	    ${NEWVERSWHAT}
 
 .if !empty(HELP_FILES)
+HELP_FILES+=	${LDRSRC}/help.common
+
 CLEANFILES+=	loader.help
 FILES+=		loader.help
 

diff --git a/stand/mips/beri/loader/Makefile b/stand/mips/beri/loader/Makefile
@@ -67,7 +67,7 @@ SRCS+=		altera_jtag_uart.c				\
 # Since we don't have a backward compatibility issue, default to this on BERI.
 CFLAGS+=	-DBOOT_PROMPT_123
 
-HELP_FILES+=	${.CURDIR}/help.mips
+HELP_FILES=	${.CURDIR}/help.mips
 
 # Always add MI sources
 .include	"${BOOTSRC}/loader.mk"

diff --git a/stand/mips/uboot/Makefile b/stand/mips/uboot/Makefile
@@ -24,7 +24,7 @@ UBLDR_LOADADDR?=	0xffffffff80800000
 # Architecture-specific loader code
 SRCS=		start.S conf.c vers.c
 
-HELP_FILES+=	help.uboot ${BOOTSRC}/fdt/help.fdt
+HELP_FILES=	${.CURDIR}/help.uboot ${BOOTSRC}/fdt/help.fdt
 
 # Always add MI sources
 .include	"${BOOTSRC}/loader.mk"

diff --git a/stand/powerpc/kboot/Makefile b/stand/powerpc/kboot/Makefile
@@ -28,7 +28,6 @@ SRCS+=		ucmpdi2.c
 CFLAGS+=	-mcpu=powerpc64
 
 # Always add MI sources
-HELP_FILES=	# Disable
 .include	"${BOOTSRC}/loader.mk"
 .PATH:		${SYSDIR}/libkern
 
@@ -45,6 +44,4 @@ CFLAGS+= -Wa,-mppc64bridge
 DPADD=		${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
 LDADD=		${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
 
-HELP_FILES+=	${FDTSRC}/help.fdt
-
 .include <bsd.prog.mk>
diff --git a/stand/powerpc/ofw/Makefile b/stand/powerpc/ofw/Makefile
@@ -27,7 +27,7 @@ SRCS+=		ucmpdi2.c
 SRCS+=		ofwfdt.c
 .endif
 
-HELP_FILES+=	${FDTSRC}/help.fdt
+HELP_FILES=	${FDTSRC}/help.fdt
 
 # Always add MI sources
 .include	"${BOOTSRC}/loader.mk"

diff --git a/stand/powerpc/ps3/Makefile b/stand/powerpc/ps3/Makefile
@@ -26,7 +26,6 @@ SRCS+=		ucmpdi2.c
 CFLAGS+=	-mcpu=powerpc64
 
 # Always add MI sources
-HELP_FILES=	# Disable
 .include	"${BOOTSRC}/loader.mk"
 .PATH:		${SYSDIR}/libkern
 

diff --git a/stand/powerpc/uboot/Makefile b/stand/powerpc/uboot/Makefile
@@ -21,7 +21,6 @@ SRCS=		start.S conf.c vers.c
 SRCS+=		ucmpdi2.c
 
 # Always add MI sources
-HELP_FILES=	# Disable
 .include	"${BOOTSRC}/loader.mk"
 .PATH:		${SYSDIR}/libkern
 

diff --git a/stand/sparc64/loader/Makefile b/stand/sparc64/loader/Makefile
@@ -30,9 +30,7 @@ CFLAGS+=	-DLOADER_DEBUG
 .endif
 
 .if exists(${.CURDIR}/help.sparc64)
-HELP_FILES+=	help.sparc64
-.else
-HELP_FILES=
+HELP_FILES=	${.CURDIR}/help.sparc64
 .endif
 
 # Always add MI sources

diff --git a/stand/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile
@@ -49,7 +49,6 @@ LIBZFSBOOT=	${BOOTOBJ}/zfs/libzfsboot.a
 .endif
 
 # Always add MI sources 
-HELP_FILES=	# Disable
 .include	"${BOOTSRC}/loader.mk"
 CFLAGS+=	-I.
 DPADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSA}