From 9a539ebbe1ee0c8557fbcdf22e849534dcbd9b53 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 19 Oct 2011 21:30:39 -0400 Subject: further clean up OS differences in makefiles No need for if() logic. Signed-off-by: Mike Frysinger --- runlevels/Makefile | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'runlevels') diff --git a/runlevels/Makefile b/runlevels/Makefile index 1f9f9aaf..f454950d 100644 --- a/runlevels/Makefile +++ b/runlevels/Makefile @@ -1,7 +1,8 @@ BOOT= bootmisc fsck hostname localmount network \ - root staticroute swap sysctl urandom + root staticroute swap sysctl urandom ${BOOT-${OS}} DEFAULT= local netmount -SHUTDOWN= savecache +SHUTDOWN= savecache ${SHUTDOWN-${OS}} +SYSINIT= ${SYSINIT-${OS}} LEVELDIR= ${DESTDIR}/${SYSCONFDIR}/runlevels SYSINITDIR= ${LEVELDIR}/sysinit @@ -16,25 +17,25 @@ include ${MK}/sys.mk include ${MK}/os.mk include ${MK}/gitignore.mk -ifeq (${OS},BSD) -BOOT+= hostid newsyslog savecore syslogd swap-blk -else ifeq (${OS},FreeBSD) -# Generic BSD stuff -BOOT+= hostid net.lo0 newsyslog savecore syslogd +BOOT-${OS}= +SHUTDOWN-${OS}= +SYSINIT-${OS}= + +BOOT-BSD= hostid newsyslog savecore syslogd swap-blk -# FreeBSD specific stuff -BOOT+= adjkerntz dumpon syscons -else ifeq (${OS},Linux) -SYSINIT+= devfs dmesg -BOOT+= hwclock keymaps modules mtab procfs termencoding -SHUTDOWN+= killprocs mount-ro -else ifeq (${OS},NetBSD) # Generic BSD stuff -BOOT+= hostid net.lo0 newsyslog savecore syslogd +BOOT-FreeBSD= hostid net.lo0 newsyslog savecore syslogd +# FreeBSD specific stuff +BOOT-FreeBSD+= adjkerntz dumpon syscons + +BOOT-Linux= hwclock keymaps modules mtab procfs termencoding +SHUTDOWN-Linux= killprocs mount-ro +SYSINIT-Linux= devfs dmesg +# Generic BSD stuff +BOOT-NetBSD= hostid net.lo0 newsyslog savecore syslogd # NetBSD specific stuff -BOOT+= devdb swap-blk ttys wscons -endif +BOOT-NetBSD+= devdb swap-blk ttys wscons all: -- cgit v1.2.3