Remove support for static and pam combined - too problematic.

7 files changed, 9 insertions, 13 deletions

diff --git a/README b/README
index 18ca3af7..ee5556fd 100644
--- a/README
+++ b/README
@@ -12,12 +12,11 @@ BIN_LDFLAGS=-static
 LIB=lib64
 DESTDIR=/tmp/openrc-image
 PAM=pam
-PAM=pam-dynamic
 TERMCAP=ncurses
 TERMCAP=termcap
 
-If you want to build static binaries and use PAM and your PAM implementation
-does not have a static pam library and you should use PAM=pam-dynamic.
+We don't support building a static OpenRC with PAM.
+You may need to use BIN_LDFLAGS=-Wl,-Bstatic on glibc instead of just -static.
 
 You can also brand OpenRC if you so wish like so
 BRANDING=\"Gentoo/$(uname -s)\"
diff --git a/src/Makefile b/src/Makefile
index 1bbb7c78..83feacea 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -91,8 +91,8 @@ LDFLAGS += -Wl,-rpath .
 TOPDIR = ..
 include $(TOPDIR)/default.mk
 include Makefile.$(TERMCAP)
-include Makefile.$(PAM)
 include Makefile.$(OS)
+include Makefile.$(PAM)
 
 all: .depend $(TARGET)
 
@@ -127,8 +127,7 @@ $(LIBRCSO): rc.map $(LIBRCOBJS)
 $(RCOBJS):
 	$(CC) $(CPPFLAGS) $(CPPFLAGS_SSD) $(CFLAGS) -c $<
 rc: version.h $(LIBEINFOSO) $(LIBRCSO) $(RCOBJS)
-	$(CC) $(LDFLAGS) $(BIN_LDFLAGS) -o rc \
-		$(RCOBJS) $(LDLIBS_LIBRC) $(LDLIBS_RC)
+	$(CC) $(LDFLAGS) $(BIN_LDFLAGS) -o rc $(RCOBJS) $(LDLIBS_RC)
 
 $(ALL_LINKS): rc
 	ln -sf rc $@
diff --git a/src/Makefile.BSD b/src/Makefile.BSD
index ab5cec7c..a9ef9791 100644
--- a/src/Makefile.BSD
+++ b/src/Makefile.BSD
@@ -1 +1,2 @@
 LDLIBS_LIBRC += -lkvm
+LDLIBS_RC += -lkvm
diff --git a/src/Makefile.Linux b/src/Makefile.Linux
index d15c968e..96a80ab9 100644
--- a/src/Makefile.Linux
+++ b/src/Makefile.Linux
@@ -1,2 +1,2 @@
-LDLIBS_RC += -ldl
+LDLIBS_RC += -Wl,-Bdynamic -ldl
 CPPFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE=500
diff --git a/src/Makefile.ncurses b/src/Makefile.ncurses
index 77cad660..204325dd 100644
--- a/src/Makefile.ncurses
+++ b/src/Makefile.ncurses
@@ -1,4 +1,2 @@
-LIBTERMCAP ?= -lncurses
-CPPFLAGS_LIBEINFO = -DHAVE_TERMCAP
-LDLIBS_LIBEINFO += $(LIBTERMCAP)
-LDLIBS_RC += $(LIBTERMCAP)
+LIBTERMCAP = -lncurses
+include Makefile.termcap
diff --git a/src/Makefile.pam-dynamic b/src/Makefile.pam-dynamic
deleted file mode 100644
index 7393939a..00000000
--- a/src/Makefile.pam-dynamic
+++ /dev/null
@@ -1,2 +0,0 @@
-CPPFLAGS_SSD = -DHAVE_PAM
-LDLIBS_RC += -Wl,-Bdynamic -lpam
diff --git a/src/Makefile.termcap b/src/Makefile.termcap
index 88017db3..10f19865 100644
--- a/src/Makefile.termcap
+++ b/src/Makefile.termcap
@@ -1,3 +1,4 @@
 LIBTERMCAP ?= -ltermcap
 CPPFLAGS_LIBEINFO = -DHAVE_TERMCAP
 LDLIBS_LIBEINFO += $(LIBTERMCAP)
+LDLIBS_RC += $(LIBTERMCAP)