[src/trunk]: src/lib/libpam Build the modules in two phases:

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4dba94c2bfbc
branches:  trunk
changeset: 754552:4dba94c2bfbc
user:      christos <christos%NetBSD.org@localhost>
date:      Mon May 03 22:12:32 2010 +0000

description:
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:

 lib/libpam/Makefile               |  4 ++--
 lib/libpam/modules/mod.mk         |  5 ++---
 lib/libpam/staticmodules/Makefile |  8 ++++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diffs (49 lines):

diff -r 51487e5d5edd -r 4dba94c2bfbc lib/libpam/Makefile
--- a/lib/libpam/Makefile       Mon May 03 18:55:09 2010 +0000
+++ b/lib/libpam/Makefile       Mon May 03 22:12:32 2010 +0000
@@ -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 -r 51487e5d5edd -r 4dba94c2bfbc lib/libpam/modules/mod.mk
--- a/lib/libpam/modules/mod.mk Mon May 03 18:55:09 2010 +0000
+++ b/lib/libpam/modules/mod.mk Mon May 03 22:12:32 2010 +0000
@@ -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 @@
 .endif
 WARNS=3
 
+.if ${MKPIC} != "no"
 LIBDPLIBS+=   pam     ${.CURDIR}/../../libpam
-
-.if ${MKPIC} != "no"
 .PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
 libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
 .else
diff -r 51487e5d5edd -r 4dba94c2bfbc lib/libpam/staticmodules/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/libpam/staticmodules/Makefile Mon May 03 22:12:32 2010 +0000
@@ -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>