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
---
 net/Makefile         | 27 ++++++++++++++++++++++++++-
 net/Makefile.FreeBSD |  6 ------
 net/Makefile.Linux   |  9 ---------
 net/Makefile.NetBSD  |  5 -----
 4 files changed, 26 insertions(+), 21 deletions(-)
 delete mode 100644 net/Makefile.FreeBSD
 delete mode 100644 net/Makefile.Linux
 delete mode 100644 net/Makefile.NetBSD

(limited to 'net')

diff --git a/net/Makefile b/net/Makefile
index 5cba7eb..af5f6e2 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -5,5 +5,30 @@ INC=	dhclient.sh dhcpcd.sh ifconfig.sh macchanger.sh macnet.sh \
 
 MK=	../mk
 include ${MK}/os.mk
-include Makefile.${OS}
+
+ifeq ($(OS),FreeBSD)
+SRCS+=		iwconfig.sh.in
+INC+=		iwconfig.sh
+
+.SUFFIXES:	.sh.BSD.in
+.sh.BSD.in.sh:
+	${CP} $< $@
+else ifeq ($(OS),Linux)
+SRCS+=		iwconfig.sh.in
+INC+=		adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh \
+		ccwgroup.sh clip.sh ethtool.sh iproute2.sh ifplugd.sh ip6to4.sh \
+		ipppd.sh iwconfig.sh netplugd.sh pppd.sh pump.sh tuntap.sh udhcpc.sh \
+		vlan.sh
+
+.SUFFIXES:	.sh.Linux.in
+.sh.Linux.in.sh:
+	${CP} $< $@
+else ifeq ($(OS),NetBSD)
+INC+=		ifwatchd.sh
+
+.SUFFIXES:	.sh.BSD.in
+.sh.BSD.in.sh:
+	${CP} $< $@
+endif
+
 include ${MK}/scripts.mk
diff --git a/net/Makefile.FreeBSD b/net/Makefile.FreeBSD
deleted file mode 100644
index 1a661db..0000000
--- a/net/Makefile.FreeBSD
+++ /dev/null
@@ -1,6 +0,0 @@
-SRCS+=		iwconfig.sh.in
-INC+=		iwconfig.sh
-
-.SUFFIXES:	.sh.BSD.in
-.sh.BSD.in.sh:
-	${CP} $< $@
diff --git a/net/Makefile.Linux b/net/Makefile.Linux
deleted file mode 100644
index f7fb087..0000000
--- a/net/Makefile.Linux
+++ /dev/null
@@ -1,9 +0,0 @@
-SRCS+=		iwconfig.sh.in
-INC+=		adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh \
-		ccwgroup.sh clip.sh ethtool.sh iproute2.sh ifplugd.sh ip6to4.sh \
-		ipppd.sh iwconfig.sh netplugd.sh pppd.sh pump.sh tuntap.sh udhcpc.sh \
-		vlan.sh
-
-.SUFFIXES:	.sh.Linux.in
-.sh.Linux.in.sh:
-	${CP} $< $@
diff --git a/net/Makefile.NetBSD b/net/Makefile.NetBSD
deleted file mode 100644
index 396bf9f..0000000
--- a/net/Makefile.NetBSD
+++ /dev/null
@@ -1,5 +0,0 @@
-INC+=		ifwatchd.sh
-
-.SUFFIXES:	.sh.BSD.in
-.sh.BSD.in.sh:
-	${CP} $< $@
-- 
cgit v1.2.3