aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2015-04-02 20:07:05 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2015-04-02 20:07:05 +0000
commitbf64b1d71ccf400d3c38a9696b70951faf654c6b (patch)
treed5aef2c33b42ea780d514260780860c5a578979d /sys
parentdb117b94d349491c39ef28656b9b111144175475 (diff)
downloadsrc-bf64b1d71ccf400d3c38a9696b70951faf654c6b.tar.gz
src-bf64b1d71ccf400d3c38a9696b70951faf654c6b.zip
Install newly added brand-*.4th and logo-*.4th files and reduce duplication.
Reviewed by: dteske Pointy hat to: dteske
Notes
Notes: svn path=/head/; revision=281002
Diffstat (limited to 'sys')
-rw-r--r--sys/boot/arm/uboot/Makefile7
-rw-r--r--sys/boot/forth/Makefile.inc26
-rw-r--r--sys/boot/i386/loader/Makefile9
-rw-r--r--sys/boot/mips/beri/loader/Makefile7
-rw-r--r--sys/boot/pc98/loader/Makefile7
-rw-r--r--sys/boot/powerpc/kboot/Makefile7
-rw-r--r--sys/boot/powerpc/ofw/Makefile7
-rw-r--r--sys/boot/powerpc/ps3/Makefile7
-rw-r--r--sys/boot/sparc64/loader/Makefile7
9 files changed, 35 insertions, 49 deletions
diff --git a/sys/boot/arm/uboot/Makefile b/sys/boot/arm/uboot/Makefile
index c69d8aaabb69..0eb59c5b4823 100644
--- a/sys/boot/arm/uboot/Makefile
+++ b/sys/boot/arm/uboot/Makefile
@@ -136,12 +136,7 @@ ldscript.generated::
fi
.if !defined(LOADER_ONLY)
-.PATH: ${.CURDIR}/../../forth
-FILES+= loader.help loader.4th support.4th loader.conf
-FILES+= screen.4th frames.4th beastie.4th
-FILES+= brand.4th check-password.4th color.4th delay.4th
-FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
-FILESDIR_loader.conf= /boot/defaults
+.include "${.CURDIR}/../../forth/Makefile.inc"
# Put sample loader.rc and menu.rc on disk but don't enable them
# by default.
diff --git a/sys/boot/forth/Makefile.inc b/sys/boot/forth/Makefile.inc
new file mode 100644
index 000000000000..27ba4b1c1bb1
--- /dev/null
+++ b/sys/boot/forth/Makefile.inc
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../forth
+FILES+= beastie.4th
+FILES+= brand.4th
+FILES+= brand-fbsd.4th
+FILES+= check-password.4th
+FILES+= color.4th
+FILES+= delay.4th
+FILES+= frames.4th
+FILES+= loader.4th
+FILES+= loader.conf
+FILES+= loader.help
+FILES+= logo-beastie.4th
+FILES+= logo-beastiebw.4th
+FILES+= logo-fbsdbw.4th
+FILES+= logo-orb.4th
+FILES+= logo-orbbw.4th
+FILES+= menu.4th
+FILES+= menu-commands.4th
+FILES+= menusets.4th
+FILES+= screen.4th
+FILES+= shortcuts.4th
+FILES+= support.4th
+FILES+= version.4th
+FILESDIR_loader.conf= /boot/defaults
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index b10399e79d5a..bd5890507cdb 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -105,13 +105,8 @@ FILES= ${LOADER}
FILESMODE_${LOADER}= ${BINMODE} -b
.if !defined(LOADER_ONLY)
-.PATH: ${.CURDIR}/../../forth
-FILES+= loader.help loader.4th support.4th loader.conf
-FILES+= screen.4th frames.4th beastie.4th
-FILES+= brand.4th check-password.4th color.4th delay.4th
-FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
-FILES+= pcibios.4th
-FILESDIR_loader.conf= /boot/defaults
+.include "${.CURDIR}/../../forth/Makefile.inc"
+FILES+= pcibios.4th
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+= loader.rc
diff --git a/sys/boot/mips/beri/loader/Makefile b/sys/boot/mips/beri/loader/Makefile
index 3da7f7f274b3..6563f4002965 100644
--- a/sys/boot/mips/beri/loader/Makefile
+++ b/sys/boot/mips/beri/loader/Makefile
@@ -121,12 +121,7 @@ loader.help: help.common help.mips
cat ${.ALLSRC} | \
awk -f ${.CURDIR}/../../../common/merge_help.awk > ${.TARGET}
-.PATH: ${.CURDIR}/../../../forth
-FILES= loader.help loader.4th support.4th loader.conf
-FILES+= screen.4th frames.4th
-FILES+= beastie.4th brand.4th check-password.4th color.4th delay.4th
-FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
-FILESDIR_loader.conf= /boot/defaults
+.include "${.CURDIR}/../../forth/Makefile.inc"
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+= loader.rc
diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile
index 4d865e7703ec..6b77090c023c 100644
--- a/sys/boot/pc98/loader/Makefile
+++ b/sys/boot/pc98/loader/Makefile
@@ -86,12 +86,7 @@ FILES= ${LOADER}
# XXX INSTALLFLAGS_loader= -b
FILESMODE_${LOADER}= ${BINMODE} -b
-.PATH: ${.CURDIR}/../../forth
-FILES+= loader.help loader.4th support.4th loader.conf
-FILES+= screen.4th frames.4th beastie.4th
-FILES+= brand.4th check-password.4th color.4th delay.4th
-FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
-FILESDIR_loader.conf= /boot/defaults
+.include "${.CURDIR}/../../forth/Makefile.inc"
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+= ${.CURDIR}/../../i386/loader/loader.rc
diff --git a/sys/boot/powerpc/kboot/Makefile b/sys/boot/powerpc/kboot/Makefile
index b8aa0167bd27..6c66bc657664 100644
--- a/sys/boot/powerpc/kboot/Makefile
+++ b/sys/boot/powerpc/kboot/Makefile
@@ -113,12 +113,7 @@ loader.help: help.common help.kboot ${.CURDIR}/../../fdt/help.fdt
cat ${.ALLSRC} | \
awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
-.PATH: ${.CURDIR}/../../forth
-FILES= loader.help loader.4th support.4th loader.conf
-FILES+= screen.4th frames.4th
-FILES+= beastie.4th brand.4th check-password.4th color.4th delay.4th
-FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
-FILESDIR_loader.conf= /boot/defaults
+.include "${.CURDIR}/../../forth/Makefile.inc"
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+= loader.rc
diff --git a/sys/boot/powerpc/ofw/Makefile b/sys/boot/powerpc/ofw/Makefile
index 60705d043b2d..910a30a48fca 100644
--- a/sys/boot/powerpc/ofw/Makefile
+++ b/sys/boot/powerpc/ofw/Makefile
@@ -108,12 +108,7 @@ loader.help: help.common help.ofw ${.CURDIR}/../../fdt/help.fdt
cat ${.ALLSRC} | \
awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
-.PATH: ${.CURDIR}/../../forth
-FILES= loader.help loader.4th support.4th loader.conf
-FILES+= screen.4th frames.4th
-FILES+= beastie.4th brand.4th check-password.4th color.4th delay.4th
-FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
-FILESDIR_loader.conf= /boot/defaults
+.include "${.CURDIR}/../../forth/Makefile.inc"
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+= loader.rc
diff --git a/sys/boot/powerpc/ps3/Makefile b/sys/boot/powerpc/ps3/Makefile
index 5016764aed02..8c5b5e781998 100644
--- a/sys/boot/powerpc/ps3/Makefile
+++ b/sys/boot/powerpc/ps3/Makefile
@@ -110,12 +110,7 @@ loader.help: help.common help.ps3 ${.CURDIR}/../../fdt/help.fdt
cat ${.ALLSRC} | \
awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
-.PATH: ${.CURDIR}/../../forth
-FILES= loader.help loader.4th support.4th loader.conf
-FILES+= screen.4th frames.4th
-FILES+= beastie.4th brand.4th check-password.4th color.4th delay.4th
-FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
-FILESDIR_loader.conf= /boot/defaults
+.include "${.CURDIR}/../../forth/Makefile.inc"
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+= loader.rc
diff --git a/sys/boot/sparc64/loader/Makefile b/sys/boot/sparc64/loader/Makefile
index d7266ad08781..051f97184a99 100644
--- a/sys/boot/sparc64/loader/Makefile
+++ b/sys/boot/sparc64/loader/Makefile
@@ -95,12 +95,7 @@ loader.help: help.common help.sparc64
cat ${.ALLSRC} | \
awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
-.PATH: ${.CURDIR}/../../forth
-FILES= loader.help loader.4th support.4th loader.conf
-FILES+= screen.4th frames.4th
-FILES+= beastie.4th brand.4th check-password.4th color.4th delay.4th
-FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
-FILESDIR_loader.conf= /boot/defaults
+.include "${.CURDIR}/../../forth/Makefile.inc"
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+= loader.rc
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 08:35:49 +0000