modules/*/Makefile.am: list tests in EXTRA_DIST uniformly

The change was prepared using the following script:
  git grep -l '^TESTS = tst-pam_' modules/ |while read m; do
    t="$(sed '/^TESTS = tst-pam_/!d;s/^TESTS = //;q' -- "$m")"
    sed -i "/^EXTRA_DIST =/ s/$t\\>/\$(TESTS)/" -- "$m"
  done

* modules/pam_access/Makefile.am (EXTRA_DIST): Replace tst-pam_access
with $(TESTS).
* modules/pam_cracklib/Makefile.am (EXTRA_DIST): Replace
tst-pam_cracklib with $(TESTS).
* modules/pam_debug/Makefile.am (EXTRA_DIST): Replace tst-pam_debug with
$(TESTS).
* modules/pam_deny/Makefile.am (EXTRA_DIST): Replace tst-pam_deny with
$(TESTS).
* modules/pam_echo/Makefile.am (EXTRA_DIST): Replace tst-pam_echo with
$(TESTS).
* modules/pam_env/Makefile.am (EXTRA_DIST): Replace tst-pam_env with
$(TESTS).
* modules/pam_exec/Makefile.am (EXTRA_DIST): Replace tst-pam_exec with
$(TESTS).
* modules/pam_faildelay/Makefile.am (EXTRA_DIST): Replace
tst-pam_faildelay with $(TESTS).
* modules/pam_filter/Makefile.am (EXTRA_DIST): Replace tst-pam_filter
with $(TESTS).
* modules/pam_ftp/Makefile.am (EXTRA_DIST): Replace tst-pam_ftp with
$(TESTS).
* modules/pam_group/Makefile.am (EXTRA_DIST): Replace tst-pam_group with
$(TESTS).
* modules/pam_issue/Makefile.am (EXTRA_DIST): Replace tst-pam_issue with
$(TESTS).
* modules/pam_keyinit/Makefile.am (EXTRA_DIST): Replace tst-pam_keyinit
with $(TESTS).
* modules/pam_lastlog/Makefile.am (EXTRA_DIST): Replace tst-pam_lastlog
with $(TESTS).
* modules/pam_limits/Makefile.am (EXTRA_DIST): Replace tst-pam_limits
with $(TESTS).
* modules/pam_listfile/Makefile.am (EXTRA_DIST): Replace
tst-pam_listfile with $(TESTS).
* modules/pam_localuser/Makefile.am (EXTRA_DIST): Replace
tst-pam_localuser with $(TESTS).
* modules/pam_loginuid/Makefile.am (EXTRA_DIST): Replace
tst-pam_loginuid with $(TESTS).
* modules/pam_mail/Makefile.am (EXTRA_DIST): Replace tst-pam_mail with
$(TESTS).
* modules/pam_mkhomedir/Makefile.am (EXTRA_DIST): Replace
tst-pam_mkhomedir with $(TESTS).
* modules/pam_motd/Makefile.am (EXTRA_DIST): Replace tst-pam_motd with
$(TESTS).
* modules/pam_namespace/Makefile.am (EXTRA_DIST): Replace
tst-pam_namespace with $(TESTS).
* modules/pam_nologin/Makefile.am (EXTRA_DIST): Replace tst-pam_nologin
with $(TESTS).
* modules/pam_permit/Makefile.am (EXTRA_DIST): Replace tst-pam_permit
with $(TESTS).
* modules/pam_pwhistory/Makefile.am (EXTRA_DIST): Replace
tst-pam_pwhistory with $(TESTS).
* modules/pam_rhosts/Makefile.am (EXTRA_DIST): Replace tst-pam_rhosts
with $(TESTS).
* modules/pam_rootok/Makefile.am (EXTRA_DIST): Replace tst-pam_rootok
with $(TESTS).
* modules/pam_securetty/Makefile.am (EXTRA_DIST): Replace
tst-pam_securetty with $(TESTS).
* modules/pam_sepermit/Makefile.am (EXTRA_DIST): Replace
tst-pam_sepermit with $(TESTS).
* modules/pam_setquota/Makefile.am (EXTRA_DIST): Replace
tst-pam_setquota with $(TESTS).
* modules/pam_shells/Makefile.am (EXTRA_DIST): Replace tst-pam_shells
with $(TESTS).
* modules/pam_stress/Makefile.am (EXTRA_DIST): Replace tst-pam_stress
with $(TESTS).
* modules/pam_succeed_if/Makefile.am (EXTRA_DIST): Replace
tst-pam_succeed_if with $(TESTS).
* modules/pam_tally/Makefile.am (EXTRA_DIST): Replace tst-pam_tally with
$(TESTS).
* modules/pam_tally2/Makefile.am (EXTRA_DIST): Replace tst-pam_tally2
with $(TESTS).
* modules/pam_time/Makefile.am (EXTRA_DIST): Replace tst-pam_time with
$(TESTS).
* modules/pam_tty_audit/Makefile.am (EXTRA_DIST): Replace
tst-pam_tty_audit with $(TESTS).
* modules/pam_umask/Makefile.am (EXTRA_DIST): Replace tst-pam_umask with
$(TESTS).
* modules/pam_userdb/Makefile.am (EXTRA_DIST): Replace tst-pam_userdb
with $(TESTS).
* modules/pam_usertype/Makefile.am (EXTRA_DIST): Replace
tst-pam_usertype with $(TESTS).
* modules/pam_warn/Makefile.am (EXTRA_DIST): Replace tst-pam_warn with
$(TESTS).
* modules/pam_wheel/Makefile.am (EXTRA_DIST): Replace tst-pam_wheel with
$(TESTS).
* modules/pam_xauth/Makefile.am (EXTRA_DIST): Replace tst-pam_xauth with
$(TESTS).

46 files changed, 46 insertions, 48 deletions

diff --git a/modules/pam_access/Makefile.am b/modules/pam_access/Makefile.am
index 2b44cb6f..829f2eea 100644
--- a/modules/pam_access/Makefile.am
+++ b/modules/pam_access/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README access.conf $(MANS) $(XMLS) tst-pam_access
+EXTRA_DIST = README access.conf $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = access.conf.5 pam_access.8
diff --git a/modules/pam_cracklib/Makefile.am b/modules/pam_cracklib/Makefile.am
index 562307ee..46bcd2b5 100644
--- a/modules/pam_cracklib/Makefile.am
+++ b/modules/pam_cracklib/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(XMLS) pam_cracklib.8 tst-pam_cracklib
+EXTRA_DIST = README $(XMLS) pam_cracklib.8 $(TESTS)
 
 TESTS = tst-pam_cracklib
 if HAVE_DOC
diff --git a/modules/pam_debug/Makefile.am b/modules/pam_debug/Makefile.am
index 2342d1b4..386bf622 100644
--- a/modules/pam_debug/Makefile.am
+++ b/modules/pam_debug/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_debug
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_debug.8
diff --git a/modules/pam_deny/Makefile.am b/modules/pam_deny/Makefile.am
index 32595f3b..e8616b6d 100644
--- a/modules/pam_deny/Makefile.am
+++ b/modules/pam_deny/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_deny
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_deny.8
diff --git a/modules/pam_echo/Makefile.am b/modules/pam_echo/Makefile.am
index 792a8ea2..24df58bf 100644
--- a/modules/pam_echo/Makefile.am
+++ b/modules/pam_echo/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_echo
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_echo.8
diff --git a/modules/pam_env/Makefile.am b/modules/pam_env/Makefile.am
index 4e36e615..e148fdd9 100644
--- a/modules/pam_env/Makefile.am
+++ b/modules/pam_env/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README pam_env.conf $(MANS) $(XMLS) tst-pam_env environment
+EXTRA_DIST = README pam_env.conf $(MANS) $(XMLS) $(TESTS) environment
 
 if HAVE_DOC
 man_MANS = pam_env.conf.5 pam_env.8 environment.5
diff --git a/modules/pam_exec/Makefile.am b/modules/pam_exec/Makefile.am
index 14eefd9f..66cce931 100644
--- a/modules/pam_exec/Makefile.am
+++ b/modules/pam_exec/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_exec
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_exec.8
diff --git a/modules/pam_faildelay/Makefile.am b/modules/pam_faildelay/Makefile.am
index 6da109f0..817fb41d 100644
--- a/modules/pam_faildelay/Makefile.am
+++ b/modules/pam_faildelay/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_faildelay
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_faildelay.8
diff --git a/modules/pam_filter/Makefile.am b/modules/pam_filter/Makefile.am
index b233d1d8..4c423434 100644
--- a/modules/pam_filter/Makefile.am
+++ b/modules/pam_filter/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = upperLOWER
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_filter
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_filter.8
diff --git a/modules/pam_ftp/Makefile.am b/modules/pam_ftp/Makefile.am
index b39ac56e..5b164a95 100644
--- a/modules/pam_ftp/Makefile.am
+++ b/modules/pam_ftp/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_ftp
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_ftp.8
diff --git a/modules/pam_group/Makefile.am b/modules/pam_group/Makefile.am
index d226ce20..6595dffd 100644
--- a/modules/pam_group/Makefile.am
+++ b/modules/pam_group/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README group.conf $(MANS) $(XMLS) tst-pam_group
+EXTRA_DIST = README group.conf $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = group.conf.5 pam_group.8
diff --git a/modules/pam_issue/Makefile.am b/modules/pam_issue/Makefile.am
index ea6ad098..a5a0bf6f 100644
--- a/modules/pam_issue/Makefile.am
+++ b/modules/pam_issue/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_issue
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_issue.8
diff --git a/modules/pam_keyinit/Makefile.am b/modules/pam_keyinit/Makefile.am
index b1089b57..82e186ff 100644
--- a/modules/pam_keyinit/Makefile.am
+++ b/modules/pam_keyinit/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(XMLS) pam_keyinit.8 tst-pam_keyinit
+EXTRA_DIST = README $(XMLS) pam_keyinit.8 $(TESTS)
 XMLS = README.xml pam_keyinit.8.xml
 
 if HAVE_DOC
diff --git a/modules/pam_lastlog/Makefile.am b/modules/pam_lastlog/Makefile.am
index 4d69e596..79333a3e 100644
--- a/modules/pam_lastlog/Makefile.am
+++ b/modules/pam_lastlog/Makefile.am
@@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = $(MANS) README
 securelibdir = $(SECUREDIR)
 secureconfdir = $(SCONFIGDIR)
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_lastlog
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_lastlog.8
diff --git a/modules/pam_limits/Makefile.am b/modules/pam_limits/Makefile.am
index 70f9775f..f6181274 100644
--- a/modules/pam_limits/Makefile.am
+++ b/modules/pam_limits/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) limits.conf tst-pam_limits
+EXTRA_DIST = README $(MANS) $(XMLS) limits.conf $(TESTS)
 
 if HAVE_DOC
 man_MANS = limits.conf.5 pam_limits.8
diff --git a/modules/pam_listfile/Makefile.am b/modules/pam_listfile/Makefile.am
index eeb70151..770a7c2d 100644
--- a/modules/pam_listfile/Makefile.am
+++ b/modules/pam_listfile/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_listfile
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_listfile.8
diff --git a/modules/pam_localuser/Makefile.am b/modules/pam_localuser/Makefile.am
index c31c7532..4569561b 100644
--- a/modules/pam_localuser/Makefile.am
+++ b/modules/pam_localuser/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_localuser
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 TESTS = tst-pam_localuser
 
diff --git a/modules/pam_loginuid/Makefile.am b/modules/pam_loginuid/Makefile.am
index a95405b8..8bfbcdbe 100644
--- a/modules/pam_loginuid/Makefile.am
+++ b/modules/pam_loginuid/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_loginuid
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_loginuid.8
diff --git a/modules/pam_mail/Makefile.am b/modules/pam_mail/Makefile.am
index beb02150..8e95b087 100644
--- a/modules/pam_mail/Makefile.am
+++ b/modules/pam_mail/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_mail
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_mail.8
diff --git a/modules/pam_mkhomedir/Makefile.am b/modules/pam_mkhomedir/Makefile.am
index 784eaed7..8236c5c8 100644
--- a/modules/pam_mkhomedir/Makefile.am
+++ b/modules/pam_mkhomedir/Makefile.am
@@ -6,7 +6,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_mkhomedir
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_mkhomedir.8 mkhomedir_helper.8
diff --git a/modules/pam_motd/Makefile.am b/modules/pam_motd/Makefile.am
index af94d6ad..7b67ebeb 100644
--- a/modules/pam_motd/Makefile.am
+++ b/modules/pam_motd/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_motd
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_motd.8
diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am
index 03a63f49..ec62b1d3 100644
--- a/modules/pam_namespace/Makefile.am
+++ b/modules/pam_namespace/Makefile.am
@@ -10,7 +10,7 @@ if HAVE_DOC
 man_MANS = namespace.conf.5 pam_namespace.8 pam_namespace_helper.8
 endif
 
-EXTRA_DIST = README namespace.conf namespace.init $(MANS) $(XMLS) tst-pam_namespace
+EXTRA_DIST = README namespace.conf namespace.init $(MANS) $(XMLS) $(TESTS)
 
 TESTS = tst-pam_namespace
 
diff --git a/modules/pam_nologin/Makefile.am b/modules/pam_nologin/Makefile.am
index 09c925ec..dd126f74 100644
--- a/modules/pam_nologin/Makefile.am
+++ b/modules/pam_nologin/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_nologin
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 TESTS = tst-pam_nologin
 
diff --git a/modules/pam_permit/Makefile.am b/modules/pam_permit/Makefile.am
index c30a9d80..1a5847b1 100644
--- a/modules/pam_permit/Makefile.am
+++ b/modules/pam_permit/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_permit
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_permit.8
diff --git a/modules/pam_pwhistory/Makefile.am b/modules/pam_pwhistory/Makefile.am
index b5d508a6..e22c8bcf 100644
--- a/modules/pam_pwhistory/Makefile.am
+++ b/modules/pam_pwhistory/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_pwhistory
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 TESTS = tst-pam_pwhistory
 
diff --git a/modules/pam_rhosts/Makefile.am b/modules/pam_rhosts/Makefile.am
index db38d82f..f7dc4665 100644
--- a/modules/pam_rhosts/Makefile.am
+++ b/modules/pam_rhosts/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_rhosts
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 TESTS = tst-pam_rhosts
 
diff --git a/modules/pam_rootok/Makefile.am b/modules/pam_rootok/Makefile.am
index 2abf239b..f5fd47ae 100644
--- a/modules/pam_rootok/Makefile.am
+++ b/modules/pam_rootok/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_rootok
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_rootok.8
diff --git a/modules/pam_securetty/Makefile.am b/modules/pam_securetty/Makefile.am
index 204400fb..bf41eff1 100644
--- a/modules/pam_securetty/Makefile.am
+++ b/modules/pam_securetty/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_securetty
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 TESTS = tst-pam_securetty
 
diff --git a/modules/pam_selinux/Makefile.am b/modules/pam_selinux/Makefile.am
index c3a753c5..e5b0a7d5 100644
--- a/modules/pam_selinux/Makefile.am
+++ b/modules/pam_selinux/Makefile.am
@@ -5,8 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(XMLS) pam_selinux.8 pam_selinux_check.8 \
-		tst-pam_selinux
+EXTRA_DIST = README $(XMLS) pam_selinux.8 pam_selinux_check.8 $(TESTS)
 
 TESTS = tst-pam_selinux
 if HAVE_DOC
diff --git a/modules/pam_sepermit/Makefile.am b/modules/pam_sepermit/Makefile.am
index 1ee5f7fa..2a1693e1 100644
--- a/modules/pam_sepermit/Makefile.am
+++ b/modules/pam_sepermit/Makefile.am
@@ -6,7 +6,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(XMLS) pam_sepermit.8 sepermit.conf sepermit.conf.5 tst-pam_sepermit
+EXTRA_DIST = README $(XMLS) pam_sepermit.8 sepermit.conf sepermit.conf.5 $(TESTS)
 
 TESTS = tst-pam_sepermit
 if HAVE_DOC
diff --git a/modules/pam_setquota/Makefile.am b/modules/pam_setquota/Makefile.am
index 15eae05c..35db0b4c 100644
--- a/modules/pam_setquota/Makefile.am
+++ b/modules/pam_setquota/Makefile.am
@@ -1,7 +1,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_setquota
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_setquota.8
diff --git a/modules/pam_shells/Makefile.am b/modules/pam_shells/Makefile.am
index a406eddd..30a5e437 100644
--- a/modules/pam_shells/Makefile.am
+++ b/modules/pam_shells/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_shells
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_shells.8
diff --git a/modules/pam_stress/Makefile.am b/modules/pam_stress/Makefile.am
index b6f66b31..88704bb0 100644
--- a/modules/pam_stress/Makefile.am
+++ b/modules/pam_stress/Makefile.am
@@ -4,7 +4,7 @@
 
 CLEANFILES = *~
 
-EXTRA_DIST = README tst-pam_stress
+EXTRA_DIST = README $(TESTS)
 
 TESTS = tst-pam_stress
 
diff --git a/modules/pam_succeed_if/Makefile.am b/modules/pam_succeed_if/Makefile.am
index 5fef344f..99ff1427 100644
--- a/modules/pam_succeed_if/Makefile.am
+++ b/modules/pam_succeed_if/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README ${MANS} ${XMLS} tst-pam_succeed_if
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 TESTS = tst-pam_succeed_if
 
diff --git a/modules/pam_tally/Makefile.am b/modules/pam_tally/Makefile.am
index 8a27f9fe..2bf3d725 100644
--- a/modules/pam_tally/Makefile.am
+++ b/modules/pam_tally/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_tally
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_tally.8
diff --git a/modules/pam_tally2/Makefile.am b/modules/pam_tally2/Makefile.am
index c95b5352..b7e2c55c 100644
--- a/modules/pam_tally2/Makefile.am
+++ b/modules/pam_tally2/Makefile.am
@@ -6,7 +6,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_tally2
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_tally2.8
diff --git a/modules/pam_time/Makefile.am b/modules/pam_time/Makefile.am
index 3d61078e..b4581017 100644
--- a/modules/pam_time/Makefile.am
+++ b/modules/pam_time/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) time.conf tst-pam_time
+EXTRA_DIST = README $(MANS) $(XMLS) time.conf $(TESTS)
 
 if HAVE_DOC
 man_MANS = time.conf.5 pam_time.8
diff --git a/modules/pam_timestamp/Makefile.am b/modules/pam_timestamp/Makefile.am
index e5064285..ccb495f2 100644
--- a/modules/pam_timestamp/Makefile.am
+++ b/modules/pam_timestamp/Makefile.am
@@ -14,7 +14,7 @@ dist_TESTS = tst-pam_timestamp
 nodist_TESTS = hmacfile
 TESTS = $(dist_TESTS) $(nodist_TESTS)
 
-EXTRA_DIST = $(MANS) $(XMLS) $(dist_TESTS)
+EXTRA_DIST = README $(MANS) $(XMLS) $(dist_TESTS)
 
 securelibdir = $(SECUREDIR)
 secureconfdir = $(SCONFIGDIR)
diff --git a/modules/pam_tty_audit/Makefile.am b/modules/pam_tty_audit/Makefile.am
index 37890f98..8f90e085 100644
--- a/modules/pam_tty_audit/Makefile.am
+++ b/modules/pam_tty_audit/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README pam_tty_audit.8 $(XMLS) tst-pam_tty_audit
+EXTRA_DIST = README pam_tty_audit.8 $(XMLS) $(TESTS)
 
 TESTS = tst-pam_tty_audit
 if HAVE_DOC
diff --git a/modules/pam_umask/Makefile.am b/modules/pam_umask/Makefile.am
index b8244c80..fd7da1b0 100644
--- a/modules/pam_umask/Makefile.am
+++ b/modules/pam_umask/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_umask
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_umask.8
diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am
index 2a9a76e7..339bfb17 100644
--- a/modules/pam_unix/Makefile.am
+++ b/modules/pam_unix/Makefile.am
@@ -5,8 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README md5.c md5_crypt.c lckpwdf.-c $(MANS) CHANGELOG \
-		tst-pam_unix $(XMLS)
+EXTRA_DIST = README md5.c md5_crypt.c lckpwdf.-c $(MANS) $(XMLS) $(TESTS) CHANGELOG
 
 if HAVE_DOC
 man_MANS = pam_unix.8 unix_chkpwd.8 unix_update.8
diff --git a/modules/pam_userdb/Makefile.am b/modules/pam_userdb/Makefile.am
index 5f2e7c8a..c5ea54b1 100644
--- a/modules/pam_userdb/Makefile.am
+++ b/modules/pam_userdb/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(XMLS) pam_userdb.8 create.pl tst-pam_userdb
+EXTRA_DIST = README $(XMLS) pam_userdb.8 create.pl $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_userdb.8
diff --git a/modules/pam_usertype/Makefile.am b/modules/pam_usertype/Makefile.am
index 5e17df11..f10ee618 100644
--- a/modules/pam_usertype/Makefile.am
+++ b/modules/pam_usertype/Makefile.am
@@ -6,7 +6,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README ${MANS} ${XMLS} tst-pam_usertype
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 TESTS = tst-pam_usertype
 
diff --git a/modules/pam_warn/Makefile.am b/modules/pam_warn/Makefile.am
index 00c6d815..1a121989 100644
--- a/modules/pam_warn/Makefile.am
+++ b/modules/pam_warn/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_warn
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_warn.8
diff --git a/modules/pam_wheel/Makefile.am b/modules/pam_wheel/Makefile.am
index ff08a573..6b0fccd3 100644
--- a/modules/pam_wheel/Makefile.am
+++ b/modules/pam_wheel/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README ${MANS} $(XMLS) tst-pam_wheel
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_wheel.8
diff --git a/modules/pam_xauth/Makefile.am b/modules/pam_xauth/Makefile.am
index 22fe5869..573f973f 100644
--- a/modules/pam_xauth/Makefile.am
+++ b/modules/pam_xauth/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README ${MANS} $(XMLS) tst-pam_xauth
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS)
 
 if HAVE_DOC
 man_MANS = pam_xauth.8