Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Clean up splash image build. Print messages when creati...



details:   https://anonhg.NetBSD.org/src/rev/fa62c86276f0
branches:  trunk
changeset: 810721:fa62c86276f0
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Tue Sep 15 02:22:43 2015 +0000

description:
Clean up splash image build.  Print messages when creating files.

diffstat:

 sys/conf/Makefile.kern.inc |   4 ++--
 sys/conf/splash.mk         |   4 ----
 sys/dev/splash/splash.mk   |  10 ++++++++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diffs (56 lines):

diff -r eb0fa656ddb1 -r fa62c86276f0 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Tue Sep 15 00:16:42 2015 +0000
+++ b/sys/conf/Makefile.kern.inc        Tue Sep 15 02:22:43 2015 +0000
@@ -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 @@
 .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"
diff -r eb0fa656ddb1 -r fa62c86276f0 sys/conf/splash.mk
--- a/sys/conf/splash.mk        Tue Sep 15 00:16:42 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-# $NetBSD: splash.mk,v 1.4 2015/09/15 00:16:42 uebayasi Exp $
-
-# Option for embedding a splashscreen image.
-.include "${S}/dev/splash/splash.mk"
diff -r eb0fa656ddb1 -r fa62c86276f0 sys/dev/splash/splash.mk
--- a/sys/dev/splash/splash.mk  Tue Sep 15 00:16:42 2015 +0000
+++ b/sys/dev/splash/splash.mk  Tue Sep 15 02:22:43 2015 +0000
@@ -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_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



Home | Main Index | Thread Index | Old Index