From ecf77254bbacf5b53d940a738ea6cdc569a28958 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Mon, 17 Oct 2011 20:18:39 -0500 Subject: consolodate Makefiles The tree contained many operating system specific Makefiles which were being included in other Makefiles. This commit removes those and adds the code to the makefiles which included them using make's conditional processing. X-Gentoo-Bug: 387441 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=387441 --- runlevels/Makefile | 21 ++++++++++++++++++++- runlevels/Makefile.BSD | 1 - runlevels/Makefile.FreeBSD | 5 ----- runlevels/Makefile.Linux | 3 --- runlevels/Makefile.NetBSD | 5 ----- 5 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 runlevels/Makefile.BSD delete mode 100644 runlevels/Makefile.FreeBSD delete mode 100644 runlevels/Makefile.Linux delete mode 100644 runlevels/Makefile.NetBSD (limited to 'runlevels') diff --git a/runlevels/Makefile b/runlevels/Makefile index ae4fff1d..782638b2 100644 --- a/runlevels/Makefile +++ b/runlevels/Makefile @@ -15,7 +15,26 @@ MK= ../mk include ${MK}/sys.mk include ${MK}/os.mk include ${MK}/gitignore.mk -include Makefile.${OS} + +ifeq ($(OS),BSD) +BOOT+= hostid newsyslog savecore syslogd swap-blk +else ifeq ($(OS),FreeBSD) +# Generic BSD stuff +BOOT+= hostid net.lo0 newsyslog savecore syslogd + +# 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 + +# NetBSD specific stuff +BOOT+= devdb swap-blk ttys wscons +endif all: diff --git a/runlevels/Makefile.BSD b/runlevels/Makefile.BSD deleted file mode 100644 index ffa758c1..00000000 --- a/runlevels/Makefile.BSD +++ /dev/null @@ -1 +0,0 @@ -BOOT+= hostid newsyslog savecore syslogd swap-blk diff --git a/runlevels/Makefile.FreeBSD b/runlevels/Makefile.FreeBSD deleted file mode 100644 index 614e965b..00000000 --- a/runlevels/Makefile.FreeBSD +++ /dev/null @@ -1,5 +0,0 @@ -# Generic BSD stuff -BOOT+= hostid net.lo0 newsyslog savecore syslogd - -# FreeBSD specific stuff -BOOT+= adjkerntz dumpon syscons diff --git a/runlevels/Makefile.Linux b/runlevels/Makefile.Linux deleted file mode 100644 index 251c6b8b..00000000 --- a/runlevels/Makefile.Linux +++ /dev/null @@ -1,3 +0,0 @@ -SYSINIT+= devfs dmesg -BOOT+= hwclock keymaps modules mtab procfs termencoding -SHUTDOWN+= killprocs mount-ro diff --git a/runlevels/Makefile.NetBSD b/runlevels/Makefile.NetBSD deleted file mode 100644 index d76ccea6..00000000 --- a/runlevels/Makefile.NetBSD +++ /dev/null @@ -1,5 +0,0 @@ -# Generic BSD stuff -BOOT+= hostid net.lo0 newsyslog savecore syslogd - -# NetBSD specific stuff -BOOT+= devdb swap-blk ttys wscons -- cgit v1.2.3