aboutsummaryrefslogtreecommitdiff
path: root/lib/libpam/Makefile
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2016-04-14 01:17:03 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2016-04-14 01:17:03 +0000
commit7cbd0a2953a27e74f8b1b261808068719c1f5260 (patch)
tree71e89abc8204df2fa8e108073d7c39eecd2f59ca /lib/libpam/Makefile
parent2d57dc7e6e01f3e8166db91ab1be0cd8f19ef0f2 (diff)
downloadsrc-7cbd0a2953a27e74f8b1b261808068719c1f5260.tar.gz
src-7cbd0a2953a27e74f8b1b261808068719c1f5260.zip
Simplify building libpam and fix libpam.a not containing the modules since r284345.
The change in r284345 moved the creation of openpam_static_modules.o to lib/libpam/static_modules but never managed to get them into libpam.a. Move this logic to lib/libpam/static_libpam and have it create a static library for libpam.a The main lib/libpam/libpam will only create a shared library. No redundancy in compilation or installation exists in this solution. This avoids requiring a pass with -D_NO_LIBPAM_SO_YET. Sponsored by: EMC / Isilon Storage Division
Notes
Notes: svn path=/head/; revision=297946
Diffstat (limited to 'lib/libpam/Makefile')
-rw-r--r--lib/libpam/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/libpam/Makefile b/lib/libpam/Makefile
index 5c3a2ae60cc5..fa73b95b140d 100644
--- a/lib/libpam/Makefile
+++ b/lib/libpam/Makefile
@@ -24,8 +24,11 @@
#
# $FreeBSD$
-# The modules must be built first, because they are built into the
-# static version of libpam.
-SUBDIR+= modules libpam static_modules
+# The modules link in libpam. They build the static modules as well.
+SUBDIR+= libpam modules
+SUBDIR_DEPEND_modules= libpam
+SUBDIR+= static_libpam
+SUBDIR_DEPEND_static_libpam= modules
+SUBDIR_PARALLEL=
.include <bsd.subdir.mk>