Source-Changes-HG archive

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

[src/trunk]: src/sys/conf Move splash logic, keep Makefile.kern.inc clean.



details:   https://anonhg.NetBSD.org/src/rev/b804a66f3936
branches:  trunk
changeset: 340285:b804a66f3936
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Sun Aug 30 07:33:53 2015 +0000

description:
Move splash logic, keep Makefile.kern.inc clean.

diffstat:

 sys/conf/Makefile.kern.inc |  9 ++-------
 sys/conf/splash.mk         |  7 +++++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diffs (41 lines):

diff -r 2dc29da605c1 -r b804a66f3936 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Sun Aug 30 06:57:51 2015 +0000
+++ b/sys/conf/Makefile.kern.inc        Sun Aug 30 07:33:53 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.213 2015/08/30 05:24:04 uebayasi Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.214 2015/08/30 07:33:53 uebayasi Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -359,12 +359,6 @@
        ${COMPILE_CTFCONVERT}
 .endif
 
-# Option for embedding a splashscreen image.
-.if defined(SPLASHSCREEN_IMAGE) 
-.include "${S}/dev/splash/splash.mk"
-init_main.o: splash_image.o
-.endif
-
 ##
 ## (7) misc targets: install, clean(dir), depend(all), lint, links, tags,
 ##                   cscope, mkid
@@ -484,6 +478,7 @@
 .endif
 .endif
 
+.include "${S}/conf/splash.mk"
 .include "${S}/conf/mdroot.mk"
 .include "${S}/conf/lint.mk"
 .include "${S}/conf/cscope.mk"
diff -r 2dc29da605c1 -r b804a66f3936 sys/conf/splash.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/conf/splash.mk        Sun Aug 30 07:33:53 2015 +0000
@@ -0,0 +1,7 @@
+# $NetBSD: splash.mk,v 1.1 2015/08/30 07:33:53 uebayasi Exp $
+
+# Option for embedding a splashscreen image.
+.if defined(SPLASHSCREEN_IMAGE) 
+.include "${S}/dev/splash/splash.mk"
+init_main.o: splash_image.o
+.endif



Home | Main Index | Thread Index | Old Index