Fix regressions from the last commits.

[linux-pam] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f5c0fc033b8d72031a7040dc19b4e6fe49541f6e..40b300da63585a82f632189753989038e948e078 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,51 @@
 #
-# Copyright (c) 2005 Thorsten Kukuk <kukuk@suse.de>
+# Copyright (c) 2005, 2006, 2007 Thorsten Kukuk <kukuk@thkukuk.de>
 #
 
-AUTOMAKE_OPTIONS = 1.8 gnu dist-bzip2
+AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 dist-xz check-news
 
-SUBDIRS = libpam libpamc libpam_misc modules po conf doc examples
+SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests
 
 CLEANFILES = *~
 
-M4_FILES = $(shell ls $(srcdir)/m4/*.m4)
-
-EXTRA_DIST = config.rpath mkinstalldirs pgp.keys.asc CHANGELOG \
-               Copyright $(M4_FILES)
+EXTRA_DIST = pgp.keys.asc CHANGELOG ChangeLog-CVS Copyright Make.xml.rules
 
 ACLOCAL_AMFLAGS = -I m4
 
+release: dist releasedocs
+
 release-docs: releasedocs
 
-releasedocs: 
+releasedocs:
+       rm -rf Linux-PAM-$(VERSION)
+       mkdir -p Linux-PAM-$(VERSION)/doc
        make -C doc releasedocs
+       tar zfc Linux-PAM-$(VERSION)-docs.tar.gz \
+               Linux-PAM-$(VERSION)/doc
+       tar jfc Linux-PAM-$(VERSION)-docs.tar.bz2 \
+               Linux-PAM-$(VERSION)/doc
+       tar Jfc Linux-PAM-$(VERSION)-docs.tar.xz \
+                Linux-PAM-$(VERSION)/doc
+       rm -rf Linux-PAM-$(VERSION)
+
+xtests:
+       make -C xtests xtests
+
+.PHONY: xtests
+
+gen_changelog_start_date = 2011-10-26
+gen-ChangeLog:
+       if test -d .git; then                                           \
+               ( $(top_srcdir)/gitlog-to-changelog --append-dot        \
+                 --since=$(gen_changelog_start_date) &&                \
+                 echo && echo &&                                       \
+                 echo 'See ChangeLog-CVS for earlier changes.'         \
+               ) > $(distdir)/ChangeLog.new &&                         \
+               rm -f $(distdir)/ChangeLog &&                           \
+               mv $(distdir)/ChangeLog.new $(distdir)/ChangeLog;       \
+       fi
+
+dist-hook: gen-ChangeLog
+.PHONY: gen-ChangeLog
+
+export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner --mode=go-w,go+rX