X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=84bf58fa4d8c00889ab517c3a558f54b01e62e0c;hb=42340d0aa25e0d0ec9c53bc81a7c5bf14283fbd7;hp=9d10a037a09f7f580ea503b01504a8a9c2aeaa10;hpb=7e5bac1a416e400bd3c8941b1c312577f2d9e9e4;p=mmh

diff --git a/Makefile.am b/Makefile.am
index 9d10a03..84bf58f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,12 +31,35 @@ MHNSEARCHPROG = $(srcdir)/etc/mhn.find.sh
 auxexecdir = @libdir@
 
 ##
+## nmh _does_ have a test suite!
+##
+
+TESTS_ENVIRONMENT = MH_TEST_DIR=`pwd`/test/testdir \
+		    MH_TEST_COMMON=`pwd`/test/common.sh \
+		    MH_OBJ_DIR=`pwd` mandir=$(mandir) bindir=$(bindir) \
+		    sysconfdir=$(sysconfdir) auxexecdir=$(auxexecdir)
+##
+## Important note: the "cleanup" test should always be last
+##
+TESTS = test/bad-input/test-header test/folder/test-create \
+	test/folder/test-total test/inc/test-deb359167 test/inc/test-eom-align \
+	test/manpages/test-manpages test/mhbuild/test-forw \
+	test/mhshow/test-cte-binary test/mhshow/test-qp \
+	test/mhshow/test-subpart test/new/test-basic test/pick/test-stderr \
+	test/repl/test-if-str test/scan/test-scan \
+	test/whatnow/test-attach-detach test/whatnow/test-cd \
+	test/whatnow/test-ls test/cleanup
+
+check_SCRIPTS = test/common.sh
+
+##
 ## Stuff that should be cleaned via "make clean"
 ##
 CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf etc/sendfiles \
 	     etc/mhn.defaults man/man.sed $(man_MANS)
 clean-local:
-	@rm -rf RPM
+	@rm -rf RPM a.out.DSYM uip/a.out.DSYM
+	@rm -rf test/testdir
 
 ##
 ## Stuff that should be cleaned via "make maintainer-clean"
@@ -44,6 +67,16 @@ clean-local:
 MAINTAINERCLEANFILES = cscope.files cscope.out
 
 ##
+## And our own superclean, to get everything left by maintainer-clean.
+##
+SUPERCLEANFILES = ChangeLog Makefile.in aclocal.m4 compile config.guess \
+		  config.h.in config.h.in~ config.sub configure depcomp \
+		  install-sh missing ylwrap nmh-*.tar.gz
+superclean: maintainer-clean
+	@rm -f $(SUPERCLEANFILES)
+.PHONY: superclean
+
+##
 ## Files that need to be built before everything else
 ##
 BUILT_SOURCES = sbr/sigmsg.h
@@ -155,7 +188,9 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \
 	     man/rcvpack.man man/rcvstore.man man/rcvtty.man man/refile.man \
 	     man/repl.man man/rmf.man man/rmm.man man/scan.man man/send.man \
 	     man/sendfiles.man man/show.man man/slocal.man man/sortm.man \
-	     man/unseen.man man/whatnow.man man/whom.man
+	     man/unseen.man man/whatnow.man man/whom.man test/README $(TESTS) \
+	     test/inc/deb359167.mbox test/inc/fromline.txt \
+	     test/inc/msgheader.txt test/inc/filler.txt test/inc/md5sums
 
 ##
 ## These are all of the definitions for each of the programs listed above.
@@ -163,11 +198,6 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \
 ## overrides that are used to select different library options from the
 ## default.
 ##
-## Note that a few programs link in extra files (specifically, popsbr.c)
-## if POP3 support is compiled in.  An Automake conditional is used for
-## this purpose.
-##
-
 uip_ali_SOURCES = uip/ali.c uip/aliasbr.c
 
 uip_anno_SOURCES = uip/anno.c uip/annosbr.c
@@ -474,6 +504,15 @@ man/man.sed: Makefile
 .man.$(manext8):
 	$(SED) -f man/man.sed $< > $@
 
+## Don't include commit hashes in ChangeLog.
+ChangeLog:
+	@[ -d .git ]  &&  git --no-pager log --abbrev-commit | \
+           egrep -v '^commit [0-9a-f]+$$' > $@  ||  true
+## Make ChangeLog phony so it will always get regenerated.  But don't
+## fail if we don't have a git repository in order to allow
+## regeneration of distribution archive or RPM.
+.PHONY: ChangeLog
+
 ##
 ## Our RPM build target
 ##
@@ -487,6 +526,7 @@ rpm: dist
 	@rpmbuild --define '_topdir $(rpmdir)' \
 	  --define '_tmppath %{_topdir}/TMP' \
 	  -ba $(rpmdir)/SPECS/nmh.spec
+.PHONY: rpm
 
 ##
 ## A target to build information needed by cscope
@@ -495,3 +535,27 @@ rpm: dist
 cscope:
 	echo "-I $(srcdir)/h -I $(srcdir)/sbr -I $(srcdir)/uip -I $(srcdir)/mts/smtp" > cscope.files
 	find $(srcdir) \( -name \*.c -o -name \*.l \) -print | grep -v dtimep.c >> cscope.files
+
+##
+## Rules to upload the distribution to savannah
+##
+
+upload: dist
+	@if test -z "$(SAVANNAH_USERNAME)"; then \
+		echo "You need to set SAVANNAH_USERNAME to the your username on savannah.gnu.org." ;\
+		echo "You can set it either in your environment or on the make command line."; \
+		false; \
+	fi
+	@echo "Did you run 'make distcheck' already?"
+	@if test -z "$(SKIP_GPG_SIG)"; then \
+		echo "Creating GPG signature (set SKIP_GPG_SIG to bypass this step)"; \
+		gpg --output $(DIST_ARCHIVES).sig --detatch-sig $(DIST_ARCHIVES); \
+	fi
+	@echo "Setting permissions for savannah.gnu.org"
+	chmod 664 $(DIST_ARCHIVES)
+	if test -f $(DIST_ARCHIVES).sig; then \
+		chmod 664 $(DIST_ARCHIVES).sig; \
+	fi
+	@echo "Uploading to savannah"
+	scp -p $(DIST_ARCHIVES)* $(SAVANNAH_USERNAME)@savannah.gnu.org:/releases/nmh
+.PHONY: upload