mirrors/linux-pam
0
0
Fork 0
mirror of https://github.com/linux-pam/linux-pam.git synced 2024-11-23 17:53:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

modules/*/Makefile.am: reorder lines to promote uniformity

Browse Source 
This is essentially a no-op change that makes modules/*/Makefile.am
files less divergent.
This commit is contained in:
Dmitry V. Levin 2020-04-27 15:34:04 +00:00
parent 1886b6020c
commit d9fe742a06
45 changed files with 43 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/pam_access/Makefile.am
View File

@ -10,8 +10,8 @@ EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS) $(secureconf_DATA)
if HAVE_DOC
man_MANS = access.conf.5 pam_access.8
endif
XMLS = README.xml access.conf.5.xml pam_access.8.xml
TESTS = tst-pam_access
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)
@ -30,11 +30,6 @@ pam_access_la_LIBADD = $(top_builddir)/libpam/libpam.la
secureconf_DATA = access.conf
if ENABLE_REGENERATE_MAN
noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
endif
TESTS = tst-pam_access

3
modules/pam_cracklib/Makefile.am
View File

@ -7,12 +7,11 @@ MAINTAINERCLEANFILES = $(MANS) README
EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
TESTS = tst-pam_cracklib
if HAVE_DOC
man_MANS = pam_cracklib.8
endif
XMLS = README.xml pam_cracklib.8.xml
TESTS = tst-pam_cracklib
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)

3
modules/pam_debug/Makefile.am
View File

@ -11,6 +11,7 @@ if HAVE_DOC
man_MANS = pam_debug.8
endif
XMLS = README.xml pam_debug.8.xml
TESTS = tst-pam_debug
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)
@ -25,8 +26,6 @@ endif
securelib_LTLIBRARIES = pam_debug.la
pam_debug_la_LIBADD = $(top_builddir)/libpam/libpam.la
TESTS = tst-pam_debug
if ENABLE_REGENERATE_MAN
noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules

7
modules/pam_deny/Makefile.am
View File

@ -10,8 +10,8 @@ EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
if HAVE_DOC
man_MANS = pam_deny.8
endif
XMLS = README.xml pam_deny.8.xml
TESTS = tst-pam_deny
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)
@ -27,11 +27,6 @@ securelib_LTLIBRARIES = pam_deny.la
pam_deny_la_LIBADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
endif
TESTS = tst-pam_deny

4
modules/pam_echo/Makefile.am
View File

@ -10,8 +10,8 @@ EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
if HAVE_DOC
man_MANS = pam_echo.8
endif
XMLS = README.xml pam_echo.8.xml
TESTS = tst-pam_echo
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)
@ -30,5 +30,3 @@ if ENABLE_REGENERATE_MAN
noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
endif
TESTS = tst-pam_echo

4
modules/pam_env/Makefile.am
View File

@ -10,8 +10,8 @@ EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS) $(secureconf_DATA) environment
if HAVE_DOC
man_MANS = pam_env.conf.5 pam_env.8 environment.5
endif
XMLS = README.xml pam_env.conf.5.xml pam_env.8.xml
TESTS = tst-pam_env
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)
@ -34,5 +34,3 @@ noinst_DATA = README
environment.5: pam_env.conf.5.xml
-include $(top_srcdir)/Make.xml.rules
endif
TESTS = tst-pam_env

7
modules/pam_exec/Makefile.am
View File

@ -10,8 +10,8 @@ EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
if HAVE_DOC
man_MANS = pam_exec.8
endif
XMLS = README.xml pam_exec.8.xml
TESTS = tst-pam_exec
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)
@ -27,11 +27,6 @@ securelib_LTLIBRARIES = pam_exec.la
pam_exec_la_LIBADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
endif
TESTS = tst-pam_exec

1
modules/pam_faildelay/Makefile.am
View File

@ -11,7 +11,6 @@ if HAVE_DOC
man_MANS = pam_faildelay.8
endif
XMLS = README.xml pam_faildelay.8.xml
TESTS = tst-pam_faildelay
securelibdir = $(SECUREDIR)

2
modules/pam_filter/Makefile.am
View File

@ -13,6 +13,7 @@ if HAVE_DOC
man_MANS = pam_filter.8
endif
XMLS = README.xml pam_filter.8.xml
TESTS = tst-pam_filter
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)
@ -28,7 +29,6 @@ include_HEADERS=pam_filter.h
pam_filter_la_LIBADD = $(top_builddir)/libpam/libpam.la
securelib_LTLIBRARIES = pam_filter.la
TESTS = tst-pam_filter
if ENABLE_REGENERATE_MAN
noinst_DATA = README

3
modules/pam_ftp/Makefile.am
View File

@ -11,6 +11,7 @@ if HAVE_DOC
man_MANS = pam_ftp.8
endif
XMLS = README.xml pam_ftp.8.xml
TESTS = tst-pam_ftp
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)
@ -25,8 +26,6 @@ endif
securelib_LTLIBRARIES = pam_ftp.la
pam_ftp_la_LIBADD = $(top_builddir)/libpam/libpam.la
TESTS = tst-pam_ftp
if ENABLE_REGENERATE_MAN
noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules

3
modules/pam_group/Makefile.am
View File

@ -11,6 +11,7 @@ if HAVE_DOC
man_MANS = group.conf.5 pam_group.8
endif
XMLS = README.xml group.conf.5.xml pam_group.8.xml
TESTS = tst-pam_group
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)
@ -27,8 +28,6 @@ pam_group_la_LIBADD = $(top_builddir)/libpam/libpam.la
secureconf_DATA = group.conf
TESTS = tst-pam_group
if ENABLE_REGENERATE_MAN
noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules

1
modules/pam_issue/Makefile.am
View File

@ -11,7 +11,6 @@ if HAVE_DOC
man_MANS = pam_issue.8
endif
XMLS = README.xml pam_issue.8.xml
TESTS = tst-pam_issue
securelibdir = $(SECUREDIR)

12
modules/pam_keyinit/Makefile.am
View File

@ -6,18 +6,13 @@ CLEANFILES = *~
MAINTAINERCLEANFILES = $(MANS) README
EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
XMLS = README.xml pam_keyinit.8.xml
if HAVE_DOC
man_MANS = pam_keyinit.8
endif
XMLS = README.xml pam_keyinit.8.xml
TESTS = tst-pam_keyinit
if ENABLE_REGENERATE_MAN
noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
endif
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)
@ -30,3 +25,8 @@ endif
securelib_LTLIBRARIES = pam_keyinit.la
pam_keyinit_la_LIBADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
endif

7
modules/pam_lastlog/Makefile.am
View File

@ -5,18 +5,17 @@
CLEANFILES = *~
MAINTAINERCLEANFILES = $(MANS) README
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)
EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
if HAVE_DOC
man_MANS = pam_lastlog.8
endif
XMLS = README.xml pam_lastlog.8.xml
TESTS = tst-pam_lastlog
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)
AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
$(WARN_CFLAGS)
AM_LDFLAGS = -no-undefined -avoid-version -module

7
modules/pam_limits/Makefile.am
View File

@ -11,7 +11,6 @@ if HAVE_DOC
man_MANS = limits.conf.5 pam_limits.8
endif
XMLS = README.xml limits.conf.5.xml pam_limits.8.xml
TESTS = tst-pam_limits
securelibdir = $(SECUREDIR)
@ -31,10 +30,10 @@ pam_limits_la_LIBADD = $(top_builddir)/libpam/libpam.la
secureconf_DATA = limits.conf
install-data-local:
mkdir -p $(DESTDIR)$(limits_conf_dir)
if ENABLE_REGENERATE_MAN
noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
endif
install-data-local:
mkdir -p $(DESTDIR)$(limits_conf_dir)

1
modules/pam_listfile/Makefile.am
View File

@ -11,7 +11,6 @@ if HAVE_DOC
man_MANS = pam_listfile.8
endif
XMLS = README.xml pam_listfile.8.xml
TESTS = tst-pam_listfile
securelibdir = $(SECUREDIR)

3
modules/pam_localuser/Makefile.am
View File

@ -7,12 +7,11 @@ MAINTAINERCLEANFILES = $(MANS) README
EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
TESTS = tst-pam_localuser
if HAVE_DOC
man_MANS = pam_localuser.8
endif
XMLS = README.xml pam_localuser.8.xml
TESTS = tst-pam_localuser
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)

7
modules/pam_loginuid/Makefile.am
View File

@ -10,8 +10,8 @@ EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
if HAVE_DOC
man_MANS = pam_loginuid.8
endif
XMLS = README.xml pam_loginuid.8.xml
TESTS = tst-pam_loginuid
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)
@ -27,11 +27,6 @@ securelib_LTLIBRARIES = pam_loginuid.la
pam_loginuid_la_LIBADD = $(top_builddir)/libpam/libpam.la @LIBAUDIT@
if ENABLE_REGENERATE_MAN
noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
endif
TESTS = tst-pam_loginuid

1
modules/pam_mail/Makefile.am
View File

@ -11,7 +11,6 @@ if HAVE_DOC
man_MANS = pam_mail.8
endif
XMLS = README.xml pam_mail.8.xml
TESTS = tst-pam_mail
securelibdir = $(SECUREDIR)

2
modules/pam_mkhomedir/Makefile.am
View File

@ -11,9 +11,7 @@ EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
if HAVE_DOC
man_MANS = pam_mkhomedir.8 mkhomedir_helper.8
endif
XMLS = README.xml pam_mkhomedir.8.xml mkhomedir_helper.8.xml
TESTS = tst-pam_mkhomedir
securelibdir = $(SECUREDIR)

1
modules/pam_motd/Makefile.am
View File

@ -11,7 +11,6 @@ if HAVE_DOC
man_MANS = pam_motd.8
endif
XMLS = README.xml pam_motd.8.xml
TESTS = tst-pam_motd
securelibdir = $(SECUREDIR)

9
modules/pam_namespace/Makefile.am
View File

@ -6,15 +6,13 @@
CLEANFILES = *~
MAINTAINERCLEANFILES = $(MANS) README
EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS) $(secureconf_DATA) namespace.init
if HAVE_DOC
man_MANS = namespace.conf.5 pam_namespace.8 pam_namespace_helper.8
endif
EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS) $(secureconf_DATA) namespace.init
TESTS = tst-pam_namespace
XMLS = README.xml namespace.conf.5.xml pam_namespace.8.xml pam_namespace_helper.8.xml
TESTS = tst-pam_namespace
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)
@ -47,7 +45,6 @@ sbin_SCRIPTS = pam_namespace_helper
uninstall-local:
-rm $(DESTDIR)$(servicedir)/pam_namespace.service
if ENABLE_REGENERATE_MAN
noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules

3
modules/pam_nologin/Makefile.am
View File

@ -7,12 +7,11 @@ MAINTAINERCLEANFILES = $(MANS) README
EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
TESTS = tst-pam_nologin
if HAVE_DOC
man_MANS = pam_nologin.8
endif
XMLS = README.xml pam_nologin.8.xml
TESTS = tst-pam_nologin
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)

1
modules/pam_permit/Makefile.am
View File

@ -11,7 +11,6 @@ if HAVE_DOC
man_MANS = pam_permit.8
endif
XMLS = README.xml pam_permit.8.xml
TESTS = tst-pam_permit
securelibdir = $(SECUREDIR)

4
modules/pam_pwhistory/Makefile.am
View File

@ -7,13 +7,11 @@ MAINTAINERCLEANFILES = $(MANS) README
EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
TESTS = tst-pam_pwhistory
if HAVE_DOC
man_MANS = pam_pwhistory.8
endif
XMLS = README.xml pam_pwhistory.8.xml
TESTS = tst-pam_pwhistory
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)

4
modules/pam_rhosts/Makefile.am
View File

@ -7,13 +7,11 @@ MAINTAINERCLEANFILES = $(MANS) README
EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
TESTS = tst-pam_rhosts
if HAVE_DOC
man_MANS = pam_rhosts.8
endif
XMLS = README.xml pam_rhosts.8.xml
TESTS = tst-pam_rhosts
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)

1
modules/pam_rootok/Makefile.am
View File

@ -11,7 +11,6 @@ if HAVE_DOC
man_MANS = pam_rootok.8
endif
XMLS = README.xml pam_rootok.8.xml
TESTS = tst-pam_rootok
securelibdir = $(SECUREDIR)

3
modules/pam_securetty/Makefile.am
View File

@ -7,12 +7,11 @@ MAINTAINERCLEANFILES = $(MANS) README
EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
TESTS = tst-pam_securetty
if HAVE_DOC
man_MANS = pam_securetty.8
endif
XMLS = README.xml pam_securetty.8.xml
TESTS = tst-pam_securetty
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)

3
modules/pam_selinux/Makefile.am
View File

@ -7,12 +7,11 @@ MAINTAINERCLEANFILES = $(MANS) README
EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS) pam_selinux_check.8
TESTS = tst-pam_selinux
if HAVE_DOC
man_MANS = pam_selinux.8
endif
XMLS = README.xml pam_selinux.8.xml
TESTS = tst-pam_selinux
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)

3
modules/pam_sepermit/Makefile.am
View File

@ -8,12 +8,11 @@ MAINTAINERCLEANFILES = $(MANS) README
EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS) $(secureconf_DATA)
TESTS = tst-pam_sepermit
if HAVE_DOC
man_MANS = pam_sepermit.8 sepermit.conf.5
endif
XMLS = README.xml pam_sepermit.8.xml sepermit.conf.5.xml
TESTS = tst-pam_sepermit
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)

1
modules/pam_setquota/Makefile.am
View File

@ -7,7 +7,6 @@ if HAVE_DOC
man_MANS = pam_setquota.8
endif
XMLS = README.xml pam_setquota.8.xml
TESTS = tst-pam_setquota
securelibdir = $(SECUREDIR)

1
modules/pam_shells/Makefile.am
View File

@ -11,7 +11,6 @@ if HAVE_DOC
man_MANS = pam_shells.8
endif
XMLS = README.xml pam_shells.8.xml
TESTS = tst-pam_shells
securelibdir = $(SECUREDIR)

4
modules/pam_succeed_if/Makefile.am
View File

@ -7,13 +7,11 @@ MAINTAINERCLEANFILES = $(MANS) README
EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
TESTS = tst-pam_succeed_if
if HAVE_DOC
man_MANS = pam_succeed_if.8
endif
XMLS = README.xml pam_succeed_if.8.xml
TESTS = tst-pam_succeed_if
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)

1
modules/pam_tally/Makefile.am
View File

@ -11,7 +11,6 @@ if HAVE_DOC
man_MANS = pam_tally.8
endif
XMLS = README.xml pam_tally.8.xml
TESTS = tst-pam_tally
securelibdir = $(SECUREDIR)

1
modules/pam_tally2/Makefile.am
View File

@ -12,7 +12,6 @@ if HAVE_DOC
man_MANS = pam_tally2.8
endif
XMLS = README.xml pam_tally2.8.xml
TESTS = tst-pam_tally2
securelibdir = $(SECUREDIR)

1
modules/pam_time/Makefile.am
View File

@ -11,7 +11,6 @@ if HAVE_DOC
man_MANS = time.conf.5 pam_time.8
endif
XMLS = README.xml time.conf.5.xml pam_time.8.xml
TESTS = tst-pam_time
securelibdir = $(SECUREDIR)

10
modules/pam_timestamp/Makefile.am
View File

@ -6,16 +6,16 @@
CLEANFILES = *~
MAINTAINERCLEANFILES = $(MANS) README
XMLS = README.xml pam_timestamp.8.xml pam_timestamp_check.8.xml
EXTRA_DIST = README $(MANS) $(XMLS) $(dist_TESTS)
if HAVE_DOC
man_MANS = pam_timestamp.8 pam_timestamp_check.8
endif
XMLS = README.xml pam_timestamp.8.xml pam_timestamp_check.8.xml
dist_TESTS = tst-pam_timestamp
nodist_TESTS = hmacfile
TESTS = $(dist_TESTS) $(nodist_TESTS)
EXTRA_DIST = README $(MANS) $(XMLS) $(dist_TESTS)
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)
@ -44,9 +44,9 @@ pam_timestamp_check_LDFLAGS = @PIE_LDFLAGS@
hmacfile_SOURCES = hmacfile.c hmacsha1.c sha1.c
hmacfile_LDADD = $(top_builddir)/libpam/libpam.la
noinst_PROGRAMS = hmacfile
if ENABLE_REGENERATE_MAN
noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
endif
noinst_PROGRAMS = hmacfile

2
modules/pam_tty_audit/Makefile.am
View File

@ -7,11 +7,11 @@ MAINTAINERCLEANFILES = $(MANS) README
EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
TESTS = tst-pam_tty_audit
if HAVE_DOC
man_MANS = pam_tty_audit.8
endif
XMLS = README.xml pam_tty_audit.8.xml
TESTS = tst-pam_tty_audit
securelibdir = $(SECUREDIR)

2
modules/pam_umask/Makefile.am
View File

@ -10,9 +10,7 @@ EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
if HAVE_DOC
man_MANS = pam_umask.8
endif
XMLS = README.xml pam_umask.8.xml
TESTS = tst-pam_umask
securelibdir = $(SECUREDIR)

1
modules/pam_unix/Makefile.am
View File

@ -11,7 +11,6 @@ if HAVE_DOC
man_MANS = pam_unix.8 unix_chkpwd.8 unix_update.8
endif
XMLS = README.xml pam_unix.8.xml unix_chkpwd.8.xml unix_update.8.xml
TESTS = tst-pam_unix
securelibdir = $(SECUREDIR)

3
modules/pam_userdb/Makefile.am
View File

@ -10,9 +10,8 @@ EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS) create.pl
if HAVE_DOC
man_MANS = pam_userdb.8
endif
TESTS = tst-pam_userdb
XMLS = README.xml pam_userdb.8.xml
TESTS = tst-pam_userdb
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)

6
modules/pam_usertype/Makefile.am
View File

@ -8,13 +8,11 @@ MAINTAINERCLEANFILES = $(MANS) README
EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
TESTS = tst-pam_usertype
if HAVE_DOC
man_MANS = pam_usertype.8
man_MANS = pam_usertype.8
endif
XMLS = README.xml pam_usertype.8.xml
TESTS = tst-pam_usertype
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)

1
modules/pam_warn/Makefile.am
View File

@ -11,7 +11,6 @@ if HAVE_DOC
man_MANS = pam_warn.8
endif
XMLS = README.xml pam_warn.8.xml
TESTS = tst-pam_warn
securelibdir = $(SECUREDIR)

1
modules/pam_wheel/Makefile.am
View File

@ -11,7 +11,6 @@ if HAVE_DOC
man_MANS = pam_wheel.8
endif
XMLS = README.xml pam_wheel.8.xml
TESTS = tst-pam_wheel
securelibdir = $(SECUREDIR)

1
modules/pam_xauth/Makefile.am
View File

@ -11,7 +11,6 @@ if HAVE_DOC
man_MANS = pam_xauth.8
endif
XMLS = README.xml pam_xauth.8.xml
TESTS = tst-pam_xauth
securelibdir = $(SECUREDIR)