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 /etc | |
| 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 'etc')
| -rw-r--r-- | etc/Makefile | 16 | ||||
| -rw-r--r-- | etc/Makefile.FreeBSD | 4 | ||||
| -rw-r--r-- | etc/Makefile.Linux | 2 | ||||
| -rw-r--r-- | etc/Makefile.NetBSD | 3 |
4 files changed, 15 insertions, 10 deletions
diff --git a/etc/Makefile b/etc/Makefile index 314225a..4f913ad 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -5,7 +5,21 @@ CLEANFILES+= rc.conf MK= ../mk include ${MK}/os.mk -include Makefile.${OS} + +ifeq ($(OS),FreeBSD) +SED_EXTRA= -e 's:@TERM@:cons25:g' +SRCS+= rc.conf.in rc.in rc.shutdown.in +CONF+= devd.conf +BIN+= rc rc.shutdown rc.devd +else ifeq ($(OS),Linux) +SED_EXTRA= -e 's:@TERM@:wsvt25:g' +SRCS+= rc.conf.in rc.in rc.shutdown.in +else ifeq ($(OS),NetBSD) +SED_EXTRA= -e 's:@TERM@:wsvt25:g' +SRCS+= rc.conf.in rc.in rc.shutdown.in +BIN+= rc rc.shutdown +endif + include ${MK}/scripts.mk # We can't use "ifndef" here because that treats set-but-empty diff --git a/etc/Makefile.FreeBSD b/etc/Makefile.FreeBSD deleted file mode 100644 index 6de7451..0000000 --- a/etc/Makefile.FreeBSD +++ /dev/null @@ -1,4 +0,0 @@ -SED_EXTRA= -e 's:@TERM@:cons25:g' -SRCS+= rc.conf.in rc.in rc.shutdown.in -CONF+= devd.conf -BIN+= rc rc.shutdown rc.devd diff --git a/etc/Makefile.Linux b/etc/Makefile.Linux deleted file mode 100644 index 5b56294..0000000 --- a/etc/Makefile.Linux +++ /dev/null @@ -1,2 +0,0 @@ -SED_EXTRA= -e 's:@TERM@:wsvt25:g' -SRCS+= rc.conf.in rc.in rc.shutdown.in diff --git a/etc/Makefile.NetBSD b/etc/Makefile.NetBSD deleted file mode 100644 index 0e85dd4..0000000 --- a/etc/Makefile.NetBSD +++ /dev/null @@ -1,3 +0,0 @@ -SED_EXTRA= -e 's:@TERM@:wsvt25:g' -SRCS+= rc.conf.in rc.in rc.shutdown.in -BIN+= rc rc.shutdown |