diff options
author | William Hubbs <williamh@gentoo.org> | 2011-10-17 20:18:39 -0500 |
---|---|---|
committer | William Hubbs <williamh@gentoo.org> | 2011-10-18 03:23:00 -0500 |
commit | ecf77254bbacf5b53d940a738ea6cdc569a28958 (patch) | |
tree | 22d9f6ec6b4882311917fe8d629c24c446bdec9d /net | |
parent | 9f95878bbd5461837b00b5ea2134768302776584 (diff) | |
download | openrc-ecf77254bbacf5b53d940a738ea6cdc569a28958.tar.gz openrc-ecf77254bbacf5b53d940a738ea6cdc569a28958.tar.bz2 openrc-ecf77254bbacf5b53d940a738ea6cdc569a28958.tar.xz |
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
Diffstat (limited to 'net')
-rw-r--r-- | net/Makefile | 27 | ||||
-rw-r--r-- | net/Makefile.FreeBSD | 6 | ||||
-rw-r--r-- | net/Makefile.Linux | 9 | ||||
-rw-r--r-- | net/Makefile.NetBSD | 5 |
4 files changed, 26 insertions, 21 deletions
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} $< $@ |