summaryrefslogtreecommitdiffstats
path: root/lib/libpam
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2011-11-24 13:18:58 +0000
committerdes <des@FreeBSD.org>2011-11-24 13:18:58 +0000
commitb93ba3b0f158601d8784267e0019c49f959e5c69 (patch)
tree9bcbb016b6e154cb01598a3a2911626b9e1aa143 /lib/libpam
parentbb1376b565f11d1111c9b10e2b7e79aca7fb1aa3 (diff)
downloadFreeBSD-src-b93ba3b0f158601d8784267e0019c49f959e5c69.zip
FreeBSD-src-b93ba3b0f158601d8784267e0019c49f959e5c69.tar.gz
Revert r227841 and part of r227798. We still build libpam in two passes,
but we use STATIC_CFLAGS instead of our own private .c.o rule. MFC after: 3 weeks
Diffstat (limited to 'lib/libpam')
-rw-r--r--lib/libpam/modules/Makefile.inc11
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/libpam/modules/Makefile.inc b/lib/libpam/modules/Makefile.inc
index 00bfbf9..8ff6ca6 100644
--- a/lib/libpam/modules/Makefile.inc
+++ b/lib/libpam/modules/Makefile.inc
@@ -5,8 +5,17 @@ PAMDIR= ${.CURDIR}/../../../../contrib/openpam
NO_INSTALLLIB=
NO_PROFILE=
-CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
+CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
+# This is nasty.
+# For the static case, libpam.a depends on the modules.
+# For the dynamic case, the modules depend on libpam.so.N
+.if defined(_NO_LIBPAM_SO_YET)
+NO_PIC=
+.else
SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR}
+DPADD+= ${LIBPAM}
+LDADD+= -lpam
+.endif
.include "../Makefile.inc"
OpenPOWER on IntegriCloud