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

This is essentially a no-op change that makes modules/*/Makefile.am
files less divergent.

45 files changed, 43 insertions, 110 deletions

diff --git a/modules/pam_access/Makefile.am b/modules/pam_access/Makefile.am
index 94bcb8c2..b13d4396 100644
--- a/modules/pam_access/Makefile.am
+++ b/modules/pam_access/Makefile.am
@@ -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
diff --git a/modules/pam_cracklib/Makefile.am b/modules/pam_cracklib/Makefile.am
index 0f73cb97..f886df85 100644
--- a/modules/pam_cracklib/Makefile.am
+++ b/modules/pam_cracklib/Makefile.am
@@ -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)
diff --git a/modules/pam_debug/Makefile.am b/modules/pam_debug/Makefile.am
index a9bd2c2d..59cedca8 100644
--- a/modules/pam_debug/Makefile.am
+++ b/modules/pam_debug/Makefile.am
@@ -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
diff --git a/modules/pam_deny/Makefile.am b/modules/pam_deny/Makefile.am
index ec7a6a2f..cc0b4955 100644
--- a/modules/pam_deny/Makefile.am
+++ b/modules/pam_deny/Makefile.am
@@ -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
diff --git a/modules/pam_echo/Makefile.am b/modules/pam_echo/Makefile.am
index 4d114886..d733cb57 100644
--- a/modules/pam_echo/Makefile.am
+++ b/modules/pam_echo/Makefile.am
@@ -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
diff --git a/modules/pam_env/Makefile.am b/modules/pam_env/Makefile.am
index fb85ec52..7347e4e5 100644
--- a/modules/pam_env/Makefile.am
+++ b/modules/pam_env/Makefile.am
@@ -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
diff --git a/modules/pam_exec/Makefile.am b/modules/pam_exec/Makefile.am
index acfbd18a..d7de6fa3 100644
--- a/modules/pam_exec/Makefile.am
+++ b/modules/pam_exec/Makefile.am
@@ -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
diff --git a/modules/pam_faildelay/Makefile.am b/modules/pam_faildelay/Makefile.am
index 562564af..c31e3836 100644
--- a/modules/pam_faildelay/Makefile.am
+++ b/modules/pam_faildelay/Makefile.am
@@ -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)
diff --git a/modules/pam_filter/Makefile.am b/modules/pam_filter/Makefile.am
index 740b377d..735efdcc 100644
--- a/modules/pam_filter/Makefile.am
+++ b/modules/pam_filter/Makefile.am
@@ -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
diff --git a/modules/pam_ftp/Makefile.am b/modules/pam_ftp/Makefile.am
index c9deaf56..49e2771a 100644
--- a/modules/pam_ftp/Makefile.am
+++ b/modules/pam_ftp/Makefile.am
@@ -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
diff --git a/modules/pam_group/Makefile.am b/modules/pam_group/Makefile.am
index a9059d40..1338b3a3 100644
--- a/modules/pam_group/Makefile.am
+++ b/modules/pam_group/Makefile.am
@@ -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
diff --git a/modules/pam_issue/Makefile.am b/modules/pam_issue/Makefile.am
index eb201e8c..5d8b62cb 100644
--- a/modules/pam_issue/Makefile.am
+++ b/modules/pam_issue/Makefile.am
@@ -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)
diff --git a/modules/pam_keyinit/Makefile.am b/modules/pam_keyinit/Makefile.am
index 8948a623..0af70609 100644
--- a/modules/pam_keyinit/Makefile.am
+++ b/modules/pam_keyinit/Makefile.am
@@ -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
diff --git a/modules/pam_lastlog/Makefile.am b/modules/pam_lastlog/Makefile.am
index ac0ecedd..7cc4c84a 100644
--- a/modules/pam_lastlog/Makefile.am
+++ b/modules/pam_lastlog/Makefile.am
@@ -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
diff --git a/modules/pam_limits/Makefile.am b/modules/pam_limits/Makefile.am
index 98eefe7f..510997bf 100644
--- a/modules/pam_limits/Makefile.am
+++ b/modules/pam_limits/Makefile.am
@@ -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)
diff --git a/modules/pam_listfile/Makefile.am b/modules/pam_listfile/Makefile.am
index 91a033d7..1be6696a 100644
--- a/modules/pam_listfile/Makefile.am
+++ b/modules/pam_listfile/Makefile.am
@@ -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)
diff --git a/modules/pam_localuser/Makefile.am b/modules/pam_localuser/Makefile.am
index 4102ba30..242cb6a2 100644
--- a/modules/pam_localuser/Makefile.am
+++ b/modules/pam_localuser/Makefile.am
@@ -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)
diff --git a/modules/pam_loginuid/Makefile.am b/modules/pam_loginuid/Makefile.am
index 4ac57082..32898933 100644
--- a/modules/pam_loginuid/Makefile.am
+++ b/modules/pam_loginuid/Makefile.am
@@ -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
diff --git a/modules/pam_mail/Makefile.am b/modules/pam_mail/Makefile.am
index 65c58af1..9d3541b8 100644
--- a/modules/pam_mail/Makefile.am
+++ b/modules/pam_mail/Makefile.am
@@ -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)
diff --git a/modules/pam_mkhomedir/Makefile.am b/modules/pam_mkhomedir/Makefile.am
index 97fdbf11..06cbd653 100644
--- a/modules/pam_mkhomedir/Makefile.am
+++ b/modules/pam_mkhomedir/Makefile.am
@@ -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)
diff --git a/modules/pam_motd/Makefile.am b/modules/pam_motd/Makefile.am
index 00124d70..2bf5917f 100644
--- a/modules/pam_motd/Makefile.am
+++ b/modules/pam_motd/Makefile.am
@@ -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)
diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am
index 9d256550..cb4f333d 100644
--- a/modules/pam_namespace/Makefile.am
+++ b/modules/pam_namespace/Makefile.am
@@ -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
diff --git a/modules/pam_nologin/Makefile.am b/modules/pam_nologin/Makefile.am
index ae13a69d..9f9eea14 100644
--- a/modules/pam_nologin/Makefile.am
+++ b/modules/pam_nologin/Makefile.am
@@ -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)
diff --git a/modules/pam_permit/Makefile.am b/modules/pam_permit/Makefile.am
index 33aa32c4..ac201f57 100644
--- a/modules/pam_permit/Makefile.am
+++ b/modules/pam_permit/Makefile.am
@@ -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)
diff --git a/modules/pam_pwhistory/Makefile.am b/modules/pam_pwhistory/Makefile.am
index af8bcb43..f65fa60a 100644
--- a/modules/pam_pwhistory/Makefile.am
+++ b/modules/pam_pwhistory/Makefile.am
@@ -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)
diff --git a/modules/pam_rhosts/Makefile.am b/modules/pam_rhosts/Makefile.am
index 0fb78f40..e15f091c 100644
--- a/modules/pam_rhosts/Makefile.am
+++ b/modules/pam_rhosts/Makefile.am
@@ -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)
diff --git a/modules/pam_rootok/Makefile.am b/modules/pam_rootok/Makefile.am
index 66344eae..06b773fe 100644
--- a/modules/pam_rootok/Makefile.am
+++ b/modules/pam_rootok/Makefile.am
@@ -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)
diff --git a/modules/pam_securetty/Makefile.am b/modules/pam_securetty/Makefile.am
index 40b613d5..4371dde8 100644
--- a/modules/pam_securetty/Makefile.am
+++ b/modules/pam_securetty/Makefile.am
@@ -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)
diff --git a/modules/pam_selinux/Makefile.am b/modules/pam_selinux/Makefile.am
index f97808c6..42d34d11 100644
--- a/modules/pam_selinux/Makefile.am
+++ b/modules/pam_selinux/Makefile.am
@@ -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)
diff --git a/modules/pam_sepermit/Makefile.am b/modules/pam_sepermit/Makefile.am
index 066b1444..a1a8a02b 100644
--- a/modules/pam_sepermit/Makefile.am
+++ b/modules/pam_sepermit/Makefile.am
@@ -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)
diff --git a/modules/pam_setquota/Makefile.am b/modules/pam_setquota/Makefile.am
index 6b40f932..54812646 100644
--- a/modules/pam_setquota/Makefile.am
+++ b/modules/pam_setquota/Makefile.am
@@ -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)
diff --git a/modules/pam_shells/Makefile.am b/modules/pam_shells/Makefile.am
index e93f63b0..56c2f2a6 100644
--- a/modules/pam_shells/Makefile.am
+++ b/modules/pam_shells/Makefile.am
@@ -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)
diff --git a/modules/pam_succeed_if/Makefile.am b/modules/pam_succeed_if/Makefile.am
index fff6ffe3..adce393b 100644
--- a/modules/pam_succeed_if/Makefile.am
+++ b/modules/pam_succeed_if/Makefile.am
@@ -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)
diff --git a/modules/pam_tally/Makefile.am b/modules/pam_tally/Makefile.am
index a8c48f0c..ed9d739b 100644
--- a/modules/pam_tally/Makefile.am
+++ b/modules/pam_tally/Makefile.am
@@ -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)
diff --git a/modules/pam_tally2/Makefile.am b/modules/pam_tally2/Makefile.am
index 49ccdaff..004e6ecc 100644
--- a/modules/pam_tally2/Makefile.am
+++ b/modules/pam_tally2/Makefile.am
@@ -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)
diff --git a/modules/pam_time/Makefile.am b/modules/pam_time/Makefile.am
index ce8418da..23d7aa59 100644
--- a/modules/pam_time/Makefile.am
+++ b/modules/pam_time/Makefile.am
@@ -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)
diff --git a/modules/pam_timestamp/Makefile.am b/modules/pam_timestamp/Makefile.am
index a5b292d8..66b85729 100644
--- a/modules/pam_timestamp/Makefile.am
+++ b/modules/pam_timestamp/Makefile.am
@@ -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
diff --git a/modules/pam_tty_audit/Makefile.am b/modules/pam_tty_audit/Makefile.am
index cbd2e5f6..9b5d5d88 100644
--- a/modules/pam_tty_audit/Makefile.am
+++ b/modules/pam_tty_audit/Makefile.am
@@ -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)
 
diff --git a/modules/pam_umask/Makefile.am b/modules/pam_umask/Makefile.am
index b0f1f5c8..98779638 100644
--- a/modules/pam_umask/Makefile.am
+++ b/modules/pam_umask/Makefile.am
@@ -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)
diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am
index 3e72736f..6837b74b 100644
--- a/modules/pam_unix/Makefile.am
+++ b/modules/pam_unix/Makefile.am
@@ -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)
diff --git a/modules/pam_userdb/Makefile.am b/modules/pam_userdb/Makefile.am
index bb6366a7..597f7fba 100644
--- a/modules/pam_userdb/Makefile.am
+++ b/modules/pam_userdb/Makefile.am
@@ -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)
diff --git a/modules/pam_usertype/Makefile.am b/modules/pam_usertype/Makefile.am
index c4e691b6..c6b67b59 100644
--- a/modules/pam_usertype/Makefile.am
+++ b/modules/pam_usertype/Makefile.am
@@ -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)
diff --git a/modules/pam_warn/Makefile.am b/modules/pam_warn/Makefile.am
index f1f33a3c..c9298283 100644
--- a/modules/pam_warn/Makefile.am
+++ b/modules/pam_warn/Makefile.am
@@ -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)
diff --git a/modules/pam_wheel/Makefile.am b/modules/pam_wheel/Makefile.am
index cd02ec57..44c9a0a3 100644
--- a/modules/pam_wheel/Makefile.am
+++ b/modules/pam_wheel/Makefile.am
@@ -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)
diff --git a/modules/pam_xauth/Makefile.am b/modules/pam_xauth/Makefile.am
index 446fe332..8a0e240d 100644
--- a/modules/pam_xauth/Makefile.am
+++ b/modules/pam_xauth/Makefile.am
@@ -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)