With the fixing of the bug that caused CPPFLAGS to get tromped on, remove

[mmh] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 820ec74..41dee6c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,10 +31,27 @@ MHNSEARCHPROG = $(srcdir)/etc/mhn.find.sh
 auxexecdir = @libdir@
 
 ##
+## nmh _does_ have a test suite!
+##
+testdir = $(srcdir)/test
+## It might be nice to configure testinstall and testbuild
+## directories, but for now they're hard-coded here and in the test
+## scripts.
+## And it would be easier to clean up if tests were launched from a
+## tmp directory, and/or each test cleaned up after itself on
+## successful completion.
+MOSTLYCLEANFILES = test/testinstall/*.actual* test/testinstall/*.expected* \
+                  test/testinstall/*.replgroupcomps test/testinstall/*.draft \
+                  test/testinstall/,*.draft* \*
+
+##
 ## 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 a.out.DSYM uip/a.out.DSYM
+       @$(testdir)/teardown-test
 
 ##
 ## Stuff that should be cleaned via "make maintainer-clean"
@@ -42,6 +59,16 @@ CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf etc/sendfiles \
 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
@@ -161,11 +188,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
@@ -186,10 +208,8 @@ uip_forw_SOURCES = uip/forw.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/annosbr.c uip/distsbr.c
 uip_forw_LDADD = $(LDADD) $(ICONVLIB)
 
-uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/termsbr.c
-if POP_SUPPORT
-uip_inc_SOURCES += uip/popsbr.c
-endif
+uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/termsbr.c \
+                 uip/popsbr.c
 uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB)
 
 uip_install_mh_SOURCES = uip/install-mh.c
@@ -227,10 +247,7 @@ uip_mhstore_SOURCES = uip/mhstore.c uip/mhparse.c uip/mhcachesbr.c \
                      uip/mhmisc.c uip/mhfree.c uip/termsbr.c uip/md5.c
 uip_mhstore_LDADD = $(LDADD) $(TERMLIB)
 
-uip_msgchk_SOURCES = uip/msgchk.c
-if POP_SUPPORT
-uip_msgchk_SOURCES += uip/popsbr.c
-endif
+uip_msgchk_SOURCES = uip/msgchk.c uip/popsbr.c
 uip_msgchk_LDADD = $(LDADD) $(SASLLIB)
 
 uip_msh_SOURCES = uip/msh.c uip/mshcmds.c uip/vmhsbr.c uip/picksbr.c \
@@ -365,8 +382,8 @@ install-exec-hook:
        fi
 
 install-data-hook:
-       rm -f $(DESTDIR)/$(man5dir)/mh_profile.5
-       ln $(DESTDIR)/$(man5dir)/mh-profile.5 $(DESTDIR)/$(man5dir)/mh_profile.5
+       rm -f $(DESTDIR)$(man5dir)/mh_profile.5
+       ln $(DESTDIR)$(man5dir)/mh-profile.5 $(DESTDIR)$(man5dir)/mh_profile.5
 ##
 ## Make sure we remove those links at uninstall time
 ##
@@ -455,11 +472,6 @@ man/man.sed: Makefile
        echo 's,%manext1%,$(manext1),g' >> $@
        echo 's,%manext5%,$(manext5),g' >> $@
        echo 's,%manext8%,$(manext8),g' >> $@
-if POP_SUPPORT
-       echo '/^%nmhbeginpop%/d;/^%nmhendpop%/d' >> $@
-else
-       echo '/^%nmhbeginpop%/,/^%nmhendpop%/d' >> $@
-endif
        echo '/%components%/r $(top_srcdir)/etc/components' >> $@
        echo ' s,%components%,,g' >> $@
        echo '/%distcomps%/r $(top_srcdir)/etc/distcomps' >> $@
@@ -482,6 +494,19 @@ endif
 .man.$(manext8):
        $(SED) -f man/man.sed $< > $@
 
+test: all
+       @$(testdir)/runalltests
+.PHONY: test
+
+## 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
 ##
@@ -495,6 +520,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
@@ -503,3 +529,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