summaryrefslogtreecommitdiff
path: root/lib/libpam
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2010-05-03 22:12:32 +0000
committerchristos <christos@NetBSD.org>2010-05-03 22:12:32 +0000
commitbbde328be4e75ea9ad02e9715ea13ca54b797ada (patch)
tree2faab2a44792780755fb8e670592fcea80ac9600 /lib/libpam
parent38f01942b4a342fc25aa06f94e68e0c9b488215f (diff)
Build the modules in two phases:
1. build the static modules first, before libpam so that the static libpam can link against the module .a files. 2. build the modules after the dynamic libpam is build, so that the dynamic modules can link against the dynamic libpam.
Diffstat (limited to 'lib/libpam')
-rw-r--r--lib/libpam/Makefile4
-rw-r--r--lib/libpam/modules/mod.mk5
-rw-r--r--lib/libpam/staticmodules/Makefile8
3 files changed, 12 insertions, 5 deletions
diff --git a/lib/libpam/Makefile b/lib/libpam/Makefile
index 9d349e38b6c..8db786f9075 100644
--- a/lib/libpam/Makefile
+++ b/lib/libpam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/12 08:18:42 christos Exp $
+# $NetBSD: Makefile,v 1.3 2010/05/03 22:12:32 christos Exp $
# Copyright 1998 Juniper Networks, Inc.
# All rights reserved.
#
@@ -27,6 +27,6 @@
# The modules must be built first, because they are built into the
# static version of libpam.
-SUBDIR= modules .WAIT libpam
+SUBDIR= staticmodules .WAIT libpam .WAIT modules
.include <bsd.subdir.mk>
diff --git a/lib/libpam/modules/mod.mk b/lib/libpam/modules/mod.mk
index 1660fdf6697..ed6abc0a1fd 100644
--- a/lib/libpam/modules/mod.mk
+++ b/lib/libpam/modules/mod.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mod.mk,v 1.8 2010/05/03 12:58:09 christos Exp $
+# $NetBSD: mod.mk,v 1.9 2010/05/03 22:12:32 christos Exp $
NOLINT= # don't build a lint library
NOPROFILE= # don't build a profile library
@@ -15,9 +15,8 @@ LIBDIR=/usr/lib/security
.endif
WARNS=3
-LIBDPLIBS+= pam ${.CURDIR}/../../libpam
-
.if ${MKPIC} != "no"
+LIBDPLIBS+= pam ${.CURDIR}/../../libpam
.PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
.else
diff --git a/lib/libpam/staticmodules/Makefile b/lib/libpam/staticmodules/Makefile
new file mode 100644
index 00000000000..982bad9cf15
--- /dev/null
+++ b/lib/libpam/staticmodules/Makefile
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2010/05/03 22:12:32 christos Exp $
+
+MAKEDIRTARGETENV=MKPIC=no
+.include <bsd.own.mk>
+
+SUBDIR=${.CURDIR}/../modules
+
+.include <bsd.subdir.mk>