Module Name: src
Committed By: uebayasi
Date: Tue Sep 15 00:16:42 UTC 2015
Modified Files:
src/sys/conf: splash.mk
src/sys/dev/splash: splash.mk
Log Message:
Fix build of SPLASHSCREEN without SPLASHSCREEN_IMAGE. Since there is no way
to change ALLFILES by makeoptions, build an empty splash_image.o.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/conf/splash.mk
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/splash/splash.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/splash.mk
diff -u src/sys/conf/splash.mk:1.3 src/sys/conf/splash.mk:1.4
--- src/sys/conf/splash.mk:1.3 Mon Sep 14 01:40:03 2015
+++ src/sys/conf/splash.mk Tue Sep 15 00:16:42 2015
@@ -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
Index: src/sys/dev/splash/splash.mk
diff -u src/sys/dev/splash/splash.mk:1.4 src/sys/dev/splash/splash.mk:1.5
--- src/sys/dev/splash/splash.mk:1.4 Mon Sep 14 01:40:03 2015
+++ src/sys/dev/splash/splash.mk Tue Sep 15 00:16:42 2015
@@ -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_ENDIAN
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
