From bbde328be4e75ea9ad02e9715ea13ca54b797ada Mon Sep 17 00:00:00 2001 From: christos Date: Mon, 3 May 2010 22:12:32 +0000 Subject: 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. --- lib/libpam/Makefile | 4 ++-- lib/libpam/modules/mod.mk | 5 ++--- lib/libpam/staticmodules/Makefile | 8 ++++++++ 3 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 lib/libpam/staticmodules/Makefile (limited to 'lib/libpam') 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 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 + +SUBDIR=${.CURDIR}/../modules + +.include -- cgit