[gentoo-commits] proj/openrc:master commit in: mk/, src/libeinfo/, src/rc/

[gentoo-commits] proj/openrc:master commit in: mk/, src/libeinfo/, src/rc/

[William Hubbs]

commit:     db6d680765b4b9a4d404f6b2e6d5644b2fe3418d
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Feb  3 00:18:55 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 04:30:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=db6d6807

rework pam, ncurses and termcap include files

This allows error checking inside the included files instead of either
including the appropriate file or a blank file.

Also the blank file named .mk gets removed by this change.

---
 mk/ncurses.mk         |    3 ---
 mk/pam.mk             |    4 ++++
 mk/termcap.mk         |    8 ++++++++
 src/libeinfo/Makefile |    2 +-
 src/rc/Makefile       |    4 ++--
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/mk/.mk b/mk/.mk
deleted file mode 100644
index e69de29..0000000

diff --git a/mk/ncurses.mk b/mk/ncurses.mk
deleted file mode 100644
index d93e8fb..0000000
--- a/mk/ncurses.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-LIBTERMCAP?=	-lncurses
-CPPFLAGS+=	-DHAVE_TERMCAP
-LDADD+=		${LIBTERMCAP}

diff --git a/mk/pam.mk b/mk/pam.mk
index 65115d5..15ffb54 100644
--- a/mk/pam.mk
+++ b/mk/pam.mk
@@ -1,6 +1,10 @@
+ifeq (${MKPAM},pam)
 LIBPAM?=	-lpam
 CPPFLAGS+=	-DHAVE_PAM
 LDADD+=		${LIBPAM}
 
 PAMDIR?=	/etc/pam.d
 PAMMODE?=	0644
+else ifneq (${MKPAM},)
+$(error if MKPAM is defined, it must be "pam")
+endif

diff --git a/mk/termcap.mk b/mk/termcap.mk
index 7a603e3..b716276 100644
--- a/mk/termcap.mk
+++ b/mk/termcap.mk
@@ -1,3 +1,11 @@
+ifeq (${MKTERMCAP},ncurses)
+LIBTERMCAP?=	-lncurses
+CPPFLAGS+=	-DHAVE_TERMCAP
+LDADD+=		${LIBTERMCAP}
+else ifeq (${MKTERMCAP},termcap)
 LIBTERMCAP?=	-ltermcap
 CPPFLAGS+=	-DHAVE_TERMCAP
 LDADD+=		${LIBTERMCAP}
+else ifneq (${MKTERMCAP},)
+$(error If MKTERMCAP is defined, it must be ncurses or termcap)
+endif

diff --git a/src/libeinfo/Makefile b/src/libeinfo/Makefile
index 1569f8f..b93b5e5 100644
--- a/src/libeinfo/Makefile
+++ b/src/libeinfo/Makefile
@@ -10,4 +10,4 @@ MK=			../../mk
 include ${MK}/lib.mk
 include ${MK}/cc.mk
 include ${MK}/debug.mk
-include ${MK}/${MKTERMCAP}.mk
+include ${MK}/termcap.mk

diff --git a/src/rc/Makefile b/src/rc/Makefile
index ca71b4a..cf63cca 100644
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -41,9 +41,9 @@ include ${MK}/prog.mk
 include ${MK}/git.mk
 include ${MK}/cc.mk
 
-include ${MK}/${MKTERMCAP}.mk
+include ${MK}/termcap.mk
 LDADD+=		${LIBDL} ${LIBKVM}
-include ${MK}/${MKPAM}.mk
+include ${MK}/pam.mk
 
 # create symlinks to rc if not an SELINUX system, otherwise create a wrapper
 # script to call rc with the proper name of the applet to execute.