From ecf77254bbacf5b53d940a738ea6cdc569a28958 Mon Sep 17 00:00:00 2001
From: William Hubbs <williamh@gentoo.org>
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
---
 sh/Makefile         | 28 +++++++++++++++++++++++++++-
 sh/Makefile.FreeBSD |  6 ------
 sh/Makefile.Linux   |  7 -------
 sh/Makefile.NetBSD  |  8 --------
 4 files changed, 27 insertions(+), 22 deletions(-)
 delete mode 100644 sh/Makefile.FreeBSD
 delete mode 100644 sh/Makefile.Linux
 delete mode 100644 sh/Makefile.NetBSD

(limited to 'sh')

diff --git a/sh/Makefile b/sh/Makefile
index 73d46418..72df96a5 100644
--- a/sh/Makefile
+++ b/sh/Makefile
@@ -8,7 +8,33 @@ INSTALLAFTER=	_installafter
 
 MK=	../mk
 include ${MK}/os.mk
-include Makefile.${OS}
+
+ifeq ($(OS),FreeBSD)
+SRCS+=		init.sh.in
+
+.SUFFIXES:	.sh.BSD.in
+.sh.BSD.in.sh:
+	${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
+
+else ifeq ($(OS),Linux)
+SRCS+=		init.sh.in init-early.sh.in udhcpc-hook.sh.in
+BIN+=		init-early.sh udhcpc-hook.sh
+
+.SUFFIXES:	.sh.Linux.in
+.sh.Linux.in.sh:
+	${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
+
+else ifeq ($(OS),NetBSD)
+SRCS+=		init.sh.in
+
+SRCS+=		ifwatchd-carrier.sh.in ifwatchd-nocarrier.sh.in
+BIN+=		ifwatchd-carrier.sh ifwatchd-nocarrier.sh
+
+.SUFFIXES:	.sh.BSD.in
+.sh.BSD.in.sh:
+	${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
+endif
+
 include ${MK}/scripts.mk
 
 _installafter:
diff --git a/sh/Makefile.FreeBSD b/sh/Makefile.FreeBSD
deleted file mode 100644
index d4e6b866..00000000
--- a/sh/Makefile.FreeBSD
+++ /dev/null
@@ -1,6 +0,0 @@
-SRCS+=		init.sh.in
-
-.SUFFIXES:	.sh.BSD.in
-.sh.BSD.in.sh:
-	${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
-
diff --git a/sh/Makefile.Linux b/sh/Makefile.Linux
deleted file mode 100644
index fb9208c4..00000000
--- a/sh/Makefile.Linux
+++ /dev/null
@@ -1,7 +0,0 @@
-SRCS+=		init.sh.in init-early.sh.in udhcpc-hook.sh.in
-BIN+=		init-early.sh udhcpc-hook.sh
-
-.SUFFIXES:	.sh.Linux.in
-.sh.Linux.in.sh:
-	${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
-
diff --git a/sh/Makefile.NetBSD b/sh/Makefile.NetBSD
deleted file mode 100644
index bd443934..00000000
--- a/sh/Makefile.NetBSD
+++ /dev/null
@@ -1,8 +0,0 @@
-SRCS+=		init.sh.in
-
-SRCS+=		ifwatchd-carrier.sh.in ifwatchd-nocarrier.sh.in
-BIN+=		ifwatchd-carrier.sh ifwatchd-nocarrier.sh
-
-.SUFFIXES:	.sh.BSD.in
-.sh.BSD.in.sh:
-	${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
-- 
cgit v1.2.3