Module Name: src
Committed By: uebayasi
Date: Sun Aug 30 07:33:53 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc
Added Files:
src/sys/conf: splash.mk
Log Message:
Move splash logic, keep Makefile.kern.inc clean.
To generate a diff of this commit:
cvs rdiff -u -r1.213 -r1.214 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r0 -r1.1 src/sys/conf/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.213 src/sys/conf/Makefile.kern.inc:1.214
--- src/sys/conf/Makefile.kern.inc:1.213 Sun Aug 30 05:24:04 2015
+++ src/sys/conf/Makefile.kern.inc Sun Aug 30 07:33:53 2015
@@ -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 @@ vers.o: ${SYSTEM_OBJ} Makefile $S/conf/n
${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 @@ install-kernel-${MACHINE_NAME}:
.endif
.endif
+.include "${S}/conf/splash.mk"
.include "${S}/conf/mdroot.mk"
.include "${S}/conf/lint.mk"
.include "${S}/conf/cscope.mk"
Added files:
Index: src/sys/conf/splash.mk
diff -u /dev/null src/sys/conf/splash.mk:1.1
--- /dev/null Sun Aug 30 07:33:53 2015
+++ src/sys/conf/splash.mk Sun Aug 30 07:33:53 2015
@@ -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
