diff options
| author | des <des@FreeBSD.org> | 2011-11-21 16:40:39 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2011-11-21 16:40:39 +0000 |
| commit | a2866d9e62ac6a68a8b8eeb0b72d0f7f5f149cde (patch) | |
| tree | 6a8692f9b8ef68587e62e1d91b533f46462adee2 /lib/libpam | |
| parent | e34035b762b9b14f715ecb5531cd5288b5b7330b (diff) | |
| download | FreeBSD-src-a2866d9e62ac6a68a8b8eeb0b72d0f7f5f149cde.zip FreeBSD-src-a2866d9e62ac6a68a8b8eeb0b72d0f7f5f149cde.tar.gz | |
Simplify the libpam build by removing the shared modules' dependency
on the shared library. The modules are loaded by the library, so we
know it'll be there when we need it.
MFC after: 3 weeks
Diffstat (limited to 'lib/libpam')
| -rw-r--r-- | lib/libpam/Makefile.inc | 2 | ||||
| -rw-r--r-- | lib/libpam/modules/Makefile.inc | 14 |
2 files changed, 3 insertions, 13 deletions
diff --git a/lib/libpam/Makefile.inc b/lib/libpam/Makefile.inc index 1c1e513..923d7bd 100644 --- a/lib/libpam/Makefile.inc +++ b/lib/libpam/Makefile.inc @@ -31,4 +31,6 @@ DEBUG_FLAGS+= -DDEBUG SHLIB_MAJOR= 5 PAM_MOD_DIR= ${LIBDIR} +STATIC_CFLAGS+= -DOPENPAM_STATIC_MODULES + .include "../Makefile.inc" diff --git a/lib/libpam/modules/Makefile.inc b/lib/libpam/modules/Makefile.inc index feb5da0..00bfbf9 100644 --- a/lib/libpam/modules/Makefile.inc +++ b/lib/libpam/modules/Makefile.inc @@ -5,20 +5,8 @@ PAMDIR= ${.CURDIR}/../../../../contrib/openpam NO_INSTALLLIB= NO_PROFILE= -CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam +CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam -# This is nasty. -# For the static case, libpam.a depends on the modules. -# For the dynamic case, the modules depend on libpam.so.N -.if defined(_NO_LIBPAM_SO_YET) -NO_PIC= -.else SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR} -DPADD+= ${LIBPAM} -LDADD+= -lpam -.endif - -.c.o: - ${CC} ${CFLAGS} -DOPENPAM_STATIC_MODULES -c ${.IMPSRC} .include "../Makefile.inc" |
