Prepare for OpenPAM Nummularia by reorganizing to match its new directory

structure.
2013-09-07 16:10:15 +00:00 · 2013-09-07 16:10:15 +00:00 · 2dd970c2a1
commit 2dd970c2a1
parent 8a441b0062
85 changed files with 11 additions and 11 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -2,7 +2,7 @@

 ACLOCAL_AMFLAGS = -I m4

-SUBDIRS = lib bin modules include
+SUBDIRS = lib/libpam bin modules include

 if WITH_DOC
 SUBDIRS += doc
--- a/bin/openpam_dump_policy/Makefile.am
+++ b/bin/openpam_dump_policy/Makefile.am
@ -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
--- a/bin/pamtest/Makefile.am
+++ b/bin/pamtest/Makefile.am
@ -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
--- a/bin/su/Makefile.am
+++ b/bin/su/Makefile.am
@ -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
--- a/configure.ac
+++ b/configure.ac
@ -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
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@ -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)

--- a/lib/libpam/Makefile.am
+++ b/lib/libpam/Makefile.am
--- a/lib/libpam/Makefile.in
+++ b/lib/libpam/Makefile.in
--- a/lib/libpam/openpam_borrow_cred.c
+++ b/lib/libpam/openpam_borrow_cred.c
--- a/lib/libpam/openpam_check_owner_perms.c
+++ b/lib/libpam/openpam_check_owner_perms.c
--- a/lib/libpam/openpam_configure.c
+++ b/lib/libpam/openpam_configure.c
--- a/lib/libpam/openpam_constants.c
+++ b/lib/libpam/openpam_constants.c
--- a/lib/libpam/openpam_constants.h
+++ b/lib/libpam/openpam_constants.h
--- a/lib/libpam/openpam_ctype.h
+++ b/lib/libpam/openpam_ctype.h
--- a/lib/libpam/openpam_debug.h
+++ b/lib/libpam/openpam_debug.h
--- a/lib/libpam/openpam_dispatch.c
+++ b/lib/libpam/openpam_dispatch.c
--- a/lib/libpam/openpam_dynamic.c
+++ b/lib/libpam/openpam_dynamic.c
--- a/lib/libpam/openpam_features.c
+++ b/lib/libpam/openpam_features.c
--- a/lib/libpam/openpam_features.h
+++ b/lib/libpam/openpam_features.h
--- a/lib/libpam/openpam_findenv.c
+++ b/lib/libpam/openpam_findenv.c
--- a/lib/libpam/openpam_free_data.c
+++ b/lib/libpam/openpam_free_data.c
--- a/lib/libpam/openpam_free_envlist.c
+++ b/lib/libpam/openpam_free_envlist.c
--- a/lib/libpam/openpam_get_feature.c
+++ b/lib/libpam/openpam_get_feature.c
--- a/lib/libpam/openpam_get_option.c
+++ b/lib/libpam/openpam_get_option.c
--- a/lib/libpam/openpam_impl.h
+++ b/lib/libpam/openpam_impl.h
--- a/lib/libpam/openpam_load.c
+++ b/lib/libpam/openpam_load.c
--- a/lib/libpam/openpam_log.c
+++ b/lib/libpam/openpam_log.c
--- a/lib/libpam/openpam_nullconv.c
+++ b/lib/libpam/openpam_nullconv.c
--- a/lib/libpam/openpam_readline.c
+++ b/lib/libpam/openpam_readline.c
--- a/lib/libpam/openpam_readlinev.c
+++ b/lib/libpam/openpam_readlinev.c
--- a/lib/libpam/openpam_readword.c
+++ b/lib/libpam/openpam_readword.c
--- a/lib/libpam/openpam_restore_cred.c
+++ b/lib/libpam/openpam_restore_cred.c
--- a/lib/libpam/openpam_set_feature.c
+++ b/lib/libpam/openpam_set_feature.c
--- a/lib/libpam/openpam_set_option.c
+++ b/lib/libpam/openpam_set_option.c
--- a/lib/libpam/openpam_static.c
+++ b/lib/libpam/openpam_static.c
--- a/lib/libpam/openpam_straddch.c
+++ b/lib/libpam/openpam_straddch.c
--- a/lib/libpam/openpam_strlcat.h
+++ b/lib/libpam/openpam_strlcat.h
--- a/lib/libpam/openpam_strlcmp.h
+++ b/lib/libpam/openpam_strlcmp.h
--- a/lib/libpam/openpam_strlcpy.h
+++ b/lib/libpam/openpam_strlcpy.h
--- a/lib/libpam/openpam_subst.c
+++ b/lib/libpam/openpam_subst.c
--- a/lib/libpam/openpam_ttyconv.c
+++ b/lib/libpam/openpam_ttyconv.c
--- a/lib/libpam/pam_acct_mgmt.c
+++ b/lib/libpam/pam_acct_mgmt.c
--- a/lib/libpam/pam_authenticate.c
+++ b/lib/libpam/pam_authenticate.c
--- a/lib/libpam/pam_authenticate_secondary.c
+++ b/lib/libpam/pam_authenticate_secondary.c
--- a/lib/libpam/pam_chauthtok.c
+++ b/lib/libpam/pam_chauthtok.c
--- a/lib/libpam/pam_close_session.c
+++ b/lib/libpam/pam_close_session.c
--- a/lib/libpam/pam_end.c
+++ b/lib/libpam/pam_end.c
--- a/lib/libpam/pam_error.c
+++ b/lib/libpam/pam_error.c
--- a/lib/libpam/pam_get_authtok.c
+++ b/lib/libpam/pam_get_authtok.c
--- a/lib/libpam/pam_get_data.c
+++ b/lib/libpam/pam_get_data.c
--- a/lib/libpam/pam_get_item.c
+++ b/lib/libpam/pam_get_item.c
--- a/lib/libpam/pam_get_mapped_authtok.c
+++ b/lib/libpam/pam_get_mapped_authtok.c
--- a/lib/libpam/pam_get_mapped_username.c
+++ b/lib/libpam/pam_get_mapped_username.c
--- a/lib/libpam/pam_get_user.c
+++ b/lib/libpam/pam_get_user.c
--- a/lib/libpam/pam_getenv.c
+++ b/lib/libpam/pam_getenv.c
--- a/lib/libpam/pam_getenvlist.c
+++ b/lib/libpam/pam_getenvlist.c
--- a/lib/libpam/pam_info.c
+++ b/lib/libpam/pam_info.c
--- a/lib/libpam/pam_open_session.c
+++ b/lib/libpam/pam_open_session.c
--- a/lib/libpam/pam_prompt.c
+++ b/lib/libpam/pam_prompt.c
--- a/lib/libpam/pam_putenv.c
+++ b/lib/libpam/pam_putenv.c
--- a/lib/libpam/pam_set_data.c
+++ b/lib/libpam/pam_set_data.c
--- a/lib/libpam/pam_set_item.c
+++ b/lib/libpam/pam_set_item.c
--- a/lib/libpam/pam_set_mapped_authtok.c
+++ b/lib/libpam/pam_set_mapped_authtok.c
--- a/lib/libpam/pam_set_mapped_username.c
+++ b/lib/libpam/pam_set_mapped_username.c
--- a/lib/libpam/pam_setcred.c
+++ b/lib/libpam/pam_setcred.c
--- a/lib/libpam/pam_setenv.c
+++ b/lib/libpam/pam_setenv.c
--- a/lib/libpam/pam_sm_acct_mgmt.c
+++ b/lib/libpam/pam_sm_acct_mgmt.c
--- a/lib/libpam/pam_sm_authenticate.c
+++ b/lib/libpam/pam_sm_authenticate.c
--- a/lib/libpam/pam_sm_authenticate_secondary.c
+++ b/lib/libpam/pam_sm_authenticate_secondary.c
--- a/lib/libpam/pam_sm_chauthtok.c
+++ b/lib/libpam/pam_sm_chauthtok.c
--- a/lib/libpam/pam_sm_close_session.c
+++ b/lib/libpam/pam_sm_close_session.c
--- a/lib/libpam/pam_sm_get_mapped_authtok.c
+++ b/lib/libpam/pam_sm_get_mapped_authtok.c
--- a/lib/libpam/pam_sm_get_mapped_username.c
+++ b/lib/libpam/pam_sm_get_mapped_username.c
--- a/lib/libpam/pam_sm_open_session.c
+++ b/lib/libpam/pam_sm_open_session.c
--- a/lib/libpam/pam_sm_set_mapped_authtok.c
+++ b/lib/libpam/pam_sm_set_mapped_authtok.c
--- a/lib/libpam/pam_sm_set_mapped_username.c
+++ b/lib/libpam/pam_sm_set_mapped_username.c
--- a/lib/libpam/pam_sm_setcred.c
+++ b/lib/libpam/pam_sm_setcred.c
--- a/lib/libpam/pam_start.c
+++ b/lib/libpam/pam_start.c
--- a/lib/libpam/pam_strerror.c
+++ b/lib/libpam/pam_strerror.c
--- a/lib/libpam/pam_verror.c
+++ b/lib/libpam/pam_verror.c
--- a/lib/libpam/pam_vinfo.c
+++ b/lib/libpam/pam_vinfo.c
--- a/lib/libpam/pam_vprompt.c
+++ b/lib/libpam/pam_vprompt.c
--- a/modules/pam_deny/Makefile.am
+++ b/modules/pam_deny/Makefile.am
@ -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
--- a/modules/pam_permit/Makefile.am
+++ b/modules/pam_permit/Makefile.am
@ -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
--- a/modules/pam_unix/Makefile.am
+++ b/modules/pam_unix/Makefile.am
@ -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