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

4 files changed, 10 insertions, 5 deletions

diff --git a/conf.d/Makefile b/conf.d/Makefile
index 374bfdb..817f60e 100644
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -6,7 +6,16 @@ CLEANFILES+=	network staticroute
 
 MK=	../mk
 include ${MK}/os.mk
-include Makefile.${OS}
+
+ifeq ($(OS),FreeBSD)
+CONF+=	ipfw moused powerd rarpd savecore syscons
+else ifeq ($(OS),Linux)
+CONF+=	consolefont dmesg hwclock keymaps killprocs modules
+SOS=	Linux
+else ifeq ($(OS),NetBSD)
+CONF+=	moused rarpd savecore
+endif
+
 include ${MK}/scripts.mk
 
 SOS?=	BSD
diff --git a/conf.d/Makefile.FreeBSD b/conf.d/Makefile.FreeBSD
deleted file mode 100644
index c43a1d4..0000000
--- a/conf.d/Makefile.FreeBSD
+++ /dev/null
@@ -1 +0,0 @@
-CONF+=	ipfw moused powerd rarpd savecore syscons
diff --git a/conf.d/Makefile.Linux b/conf.d/Makefile.Linux
deleted file mode 100644
index 369b3df..0000000
--- a/conf.d/Makefile.Linux
+++ /dev/null
@@ -1,2 +0,0 @@
-CONF+=	consolefont dmesg hwclock keymaps killprocs modules
-SOS=	Linux
diff --git a/conf.d/Makefile.NetBSD b/conf.d/Makefile.NetBSD
deleted file mode 100644
index 18a52cc..0000000
--- a/conf.d/Makefile.NetBSD
+++ /dev/null
@@ -1 +0,0 @@
-CONF+=	moused rarpd savecore