Module Name: src
Committed By: christos
Date: Mon May 3 22:12:33 UTC 2010
Modified Files:
src/lib/libpam: Makefile
src/lib/libpam/modules: mod.mk
Added Files:
src/lib/libpam/staticmodules: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libpam/Makefile
cvs rdiff -u -r1.8 -r1.9 src/lib/libpam/modules/mod.mk
cvs rdiff -u -r0 -r1.1 src/lib/libpam/staticmodules/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/Makefile
diff -u src/lib/libpam/Makefile:1.2 src/lib/libpam/Makefile:1.3
--- src/lib/libpam/Makefile:1.2 Sun Dec 12 03:18:42 2004
+++ src/lib/libpam/Makefile Mon May 3 18:12:32 2010
@@ -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>
Index: src/lib/libpam/modules/mod.mk
diff -u src/lib/libpam/modules/mod.mk:1.8 src/lib/libpam/modules/mod.mk:1.9
--- src/lib/libpam/modules/mod.mk:1.8 Mon May 3 08:58:09 2010
+++ src/lib/libpam/modules/mod.mk Mon May 3 18:12:32 2010
@@ -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
-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
Added files:
Index: src/lib/libpam/staticmodules/Makefile
diff -u /dev/null src/lib/libpam/staticmodules/Makefile:1.1
--- /dev/null Mon May 3 18:12:33 2010
+++ src/lib/libpam/staticmodules/Makefile Mon May 3 18:12:32 2010
@@ -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>
