Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Fix build of SPLASHSCREEN without SPLASHSCREEN_IMAGE. S...
details: https://anonhg.NetBSD.org/src/rev/f8895b61c60b
branches: trunk
changeset: 340578:f8895b61c60b
user: uebayasi <uebayasi%NetBSD.org@localhost>
date: Tue Sep 15 00:16:42 2015 +0000
description:
Fix build of SPLASHSCREEN without SPLASHSCREEN_IMAGE. Since there is no way
to change ALLFILES by makeoptions, build an empty splash_image.o.
diffstat:
sys/conf/splash.mk | 4 +---
sys/dev/splash/splash.mk | 7 ++++++-
2 files changed, 7 insertions(+), 4 deletions(-)
diffs (34 lines):
diff -r 74562f9411d8 -r f8895b61c60b sys/conf/splash.mk
--- a/sys/conf/splash.mk Mon Sep 14 15:51:29 2015 +0000
+++ b/sys/conf/splash.mk Tue Sep 15 00:16:42 2015 +0000
@@ -1,6 +1,4 @@
-# $NetBSD: splash.mk,v 1.3 2015/09/14 01:40:03 uebayasi Exp $
+# $NetBSD: splash.mk,v 1.4 2015/09/15 00:16:42 uebayasi Exp $
# Option for embedding a splashscreen image.
-.if defined(SPLASHSCREEN_IMAGE)
.include "${S}/dev/splash/splash.mk"
-.endif
diff -r 74562f9411d8 -r f8895b61c60b sys/dev/splash/splash.mk
--- a/sys/dev/splash/splash.mk Mon Sep 14 15:51:29 2015 +0000
+++ b/sys/dev/splash/splash.mk Tue Sep 15 00:16:42 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: splash.mk,v 1.4 2015/09/14 01:40:03 uebayasi Exp $
+# $NetBSD: splash.mk,v 1.5 2015/09/15 00:16:42 uebayasi Exp $
# Makefile for embedding splash image into kernel.
.include <bsd.endian.mk>
@@ -18,8 +18,13 @@
BFD_TARGET=${BFD_ELFTARGET}-${BFD_CPU}
.endif
+.if defined(SPLASHSCREEN_IMAGE)
splash_image.o: ${SPLASHSCREEN_IMAGE}
cp ${SPLASHSCREEN_IMAGE} splash.image
${OBJCOPY} -I binary -B ${MACHINE_CPU:C/x86_64/i386/} \
-O ${BFD_TARGET} splash.image splash_image.o
rm splash.image
+.else
+splash_image.c:
+ echo > $@
+.endif
Home |
Main Index |
Thread Index |
Old Index