Module Name: src
Committed By: uebayasi
Date: Tue Sep 15 02:22:43 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc
src/sys/dev/splash: splash.mk
Removed Files:
src/sys/conf: splash.mk
Log Message:
Clean up splash image build. Print messages when creating files.
To generate a diff of this commit:
cvs rdiff -u -r1.246 -r1.247 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.4 -r0 src/sys/conf/splash.mk
cvs rdiff -u -r1.5 -r1.6 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/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.246 src/sys/conf/Makefile.kern.inc:1.247
--- src/sys/conf/Makefile.kern.inc:1.246 Fri Sep 11 01:40:52 2015
+++ src/sys/conf/Makefile.kern.inc Tue Sep 15 02:22:43 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.246 2015/09/11 01:40:52 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.247 2015/09/15 02:22:43 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -410,7 +410,7 @@ install-kernel-${MACHINE_NAME}:
.include "${S}/conf/ldscript.mk"
.include "${S}/conf/assym.mk"
.include "${S}/conf/newvers.mk"
-.include "${S}/conf/splash.mk"
+.include "${S}/dev/splash/splash.mk"
.include "${S}/conf/mdroot.mk"
.include "${S}/conf/lint.mk"
.include "${S}/conf/cscope.mk"
Index: src/sys/dev/splash/splash.mk
diff -u src/sys/dev/splash/splash.mk:1.5 src/sys/dev/splash/splash.mk:1.6
--- src/sys/dev/splash/splash.mk:1.5 Tue Sep 15 00:16:42 2015
+++ src/sys/dev/splash/splash.mk Tue Sep 15 02:22:43 2015
@@ -1,4 +1,6 @@
-# $NetBSD: splash.mk,v 1.5 2015/09/15 00:16:42 uebayasi Exp $
+# $NetBSD: splash.mk,v 1.6 2015/09/15 02:22:43 uebayasi Exp $
+
+.if defined(SPLASHSCREEN_IMAGE)
# Makefile for embedding splash image into kernel.
.include <bsd.endian.mk>
@@ -18,13 +20,17 @@ BFD_TARGET=${BFD_ELFTARGET}-${BFD_ENDIAN
BFD_TARGET=${BFD_ELFTARGET}-${BFD_CPU}
.endif
-.if defined(SPLASHSCREEN_IMAGE)
splash_image.o: ${SPLASHSCREEN_IMAGE}
+ ${_MKTARGET_CREATE}
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
+
+# SPLASHSCREEN_IMAGE is not defined; build empty splash_image.o.
splash_image.c:
+ ${_MKTARGET_CREATE}
echo > $@
+
.endif
