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 /conf.d/Makefile | |
parent | 9f95878bbd5461837b00b5ea2134768302776584 (diff) |
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 'conf.d/Makefile')
-rw-r--r-- | conf.d/Makefile | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/conf.d/Makefile b/conf.d/Makefile index 374bfdb7..817f60e2 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 |