diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-04-14 01:17:03 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-04-14 01:17:03 +0000 |
| commit | 5fca9ae8c1d4e5632ade9a2b66038200c6a9b163 (patch) | |
| tree | 71e89abc8204df2fa8e108073d7c39eecd2f59ca /lib/libpam/Makefile | |
| parent | 27e4615bdfeaf0cf31dc7d3a8131a304ff54aeef (diff) | |
| download | FreeBSD-src-5fca9ae8c1d4e5632ade9a2b66038200c6a9b163.zip FreeBSD-src-5fca9ae8c1d4e5632ade9a2b66038200c6a9b163.tar.gz | |
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
Diffstat (limited to 'lib/libpam/Makefile')
| -rw-r--r-- | lib/libpam/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/libpam/Makefile b/lib/libpam/Makefile index 5c3a2ae..fa73b95 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> |
