mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-23 19:28:36 +00:00
MFV (r255364): move the code around in preparation for Nummularia.
This commit is contained in:
Dag-Erling Smørgrav
commit
f7e6344d4a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=255369
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
SUBDIRS = lib bin modules include
|
||||
SUBDIRS = lib/libpam bin modules include
|
||||
|
||||
if WITH_DOC
|
||||
SUBDIRS += doc
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# $Id: Makefile.am 538 2012-03-31 17:04:29Z des $
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
|
||||
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam
|
||||
|
||||
noinst_PROGRAMS = openpam_dump_policy
|
||||
openpam_dump_policy_SOURCES = openpam_dump_policy.c
|
||||
openpam_dump_policy_LDADD = $(top_builddir)/lib/libpam.la
|
||||
openpam_dump_policy_LDADD = $(top_builddir)/lib/libpam/libpam.la
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@ INCLUDES = -I$(top_srcdir)/include
|
|||
|
||||
bin_PROGRAMS = pamtest
|
||||
pamtest_SOURCES = pamtest.c
|
||||
pamtest_LDADD = $(top_builddir)/lib/libpam.la
|
||||
pamtest_LDADD = $(top_builddir)/lib/libpam/libpam.la
|
||||
|
||||
dist_man1_MANS = pamtest.1
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@ INCLUDES = -I$(top_srcdir)/include
|
|||
|
||||
bin_PROGRAMS = su
|
||||
su_SOURCES = su.c
|
||||
su_LDADD = $(top_builddir)/lib/libpam.la
|
||||
su_LDADD = $(top_builddir)/lib/libpam/libpam.la
|
||||
|
||||
dist_man1_MANS = su.1
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ dnl $Id: configure.ac 610 2012-05-26 14:03:45Z des $
|
|||
AC_PREREQ([2.62])
|
||||
AC_REVISION([$Id: configure.ac 610 2012-05-26 14:03:45Z des $])
|
||||
AC_INIT([OpenPAM], [20120526], [des@des.no])
|
||||
AC_CONFIG_SRCDIR([lib/pam_start.c])
|
||||
AC_CONFIG_SRCDIR([lib/libpam/pam_start.c])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AM_INIT_AUTOMAKE([foreign])
|
||||
AM_CONFIG_HEADER([config.h])
|
||||
|
|
@ -119,7 +119,7 @@ AC_CONFIG_FILES([
|
|||
doc/man/Makefile
|
||||
include/Makefile
|
||||
include/security/Makefile
|
||||
lib/Makefile
|
||||
lib/libpam/Makefile
|
||||
modules/Makefile
|
||||
modules/pam_deny/Makefile
|
||||
modules/pam_permit/Makefile
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ CLEANFILES = $(ALLCMAN) openpam.3 pam.3
|
|||
|
||||
GENDOC = $(top_srcdir)/misc/gendoc.pl
|
||||
|
||||
LIBSRCDIR = $(top_srcdir)/lib
|
||||
LIBSRCDIR = $(top_srcdir)/lib/libpam
|
||||
|
||||
VPATH = $(LIBSRCDIR) $(srcdir)
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,11 @@
|
|||
|
||||
#include "openpam_impl.h"
|
||||
|
||||
#ifdef OPENPAM_DEBUG
|
||||
int openpam_debug = 1;
|
||||
#else
|
||||
int openpam_debug = 0;
|
||||
#endif
|
||||
|
||||
#if !defined(openpam_log)
|
||||
|
||||
|
|
@ -7,4 +7,4 @@ pkglib_LTLIBRARIES = pam_deny.la
|
|||
|
||||
pam_deny_la_SOURCES = pam_deny.c
|
||||
pam_deny_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@
|
||||
pam_deny_la_LIBADD = $(top_builddir)/lib/libpam.la
|
||||
pam_deny_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la
|
||||
|
|
|
|||
|
|
@ -7,4 +7,4 @@ pkglib_LTLIBRARIES = pam_permit.la
|
|||
|
||||
pam_permit_la_SOURCES = pam_permit.c
|
||||
pam_permit_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@
|
||||
pam_permit_la_LIBADD = $(top_builddir)/lib/libpam.la
|
||||
pam_permit_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la
|
||||
|
|
|
|||
|
|
@ -8,5 +8,5 @@ pkglib_LTLIBRARIES = pam_unix.la
|
|||
|
||||
pam_unix_la_SOURCES = pam_unix.c
|
||||
pam_unix_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@
|
||||
pam_unix_la_LIBADD = $(top_builddir)/lib/libpam.la @CRYPT_LIBS@
|
||||
pam_unix_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la @CRYPT_LIBS@
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
OPENPAM= ${.CURDIR}/../../../contrib/openpam
|
||||
.PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man
|
||||
.PATH: ${OPENPAM}/include ${OPENPAM}/lib/libpam ${OPENPAM}/doc/man
|
||||
|
||||
LIB= pam
|
||||
NO_PROFILE=
|
||||
|
|
|
|||
Loading…
Reference in a new issue