X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=c8006a9ab4b9b8850b5edda240d93f1ad8fa4897;hb=f423b06bf5ab4a966b17857f027a46e74447f438;hp=c8b75879b3a646d9251493cc060b023bc24abebb;hpb=ffa47b9363c0abd2ba809445f52e622a15f8d13c;p=mmh diff --git a/Makefile.am b/Makefile.am index c8b7587..c8006a9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,30 +40,43 @@ TESTS_ENVIRONMENT = MH_OBJ_DIR=@abs_builddir@ \ ## ## Important note: the "cleanup" test should always be last ## -TESTS = test/bad-input/test-header test/comp/test-comp-format \ +TESTS = test/bad-input/test-header \ + test/burst/test-burst \ + test/comp/test-comp-format \ test/folder/test-create \ test/folder/test-total test/format/test-localmbox \ test/format/test-myname test/format/test-myhost \ test/format/test-mymbox \ + test/forw/test-forw-digest \ + test/forw/test-forw-format \ test/inc/test-deb359167 test/inc/test-eom-align \ + test/inc/test-inc-scanout \ test/manpages/test-manpages test/mhbuild/test-forw \ + test/mhlist/test-mhlist test/mhparam/test-mhparam \ test/mhpath/test-mhpath \ test/mhshow/test-cte-binary test/mhshow/test-qp \ - test/mhshow/test-subpart test/new/test-basic test/pick/test-stderr \ + test/mhshow/test-subpart test/mhstore/test-mhstore \ + test/new/test-basic \ + test/pick/test-pick test/pick/test-stderr \ + test/post/test-post-basic test/post/test-post-multiple \ + test/post/test-post-dcc test/post/test-post-fcc \ + test/post/test-post-multifrom test/post/test-post-envelope \ + test/post/test-post-group \ + test/refile/test-refile \ test/repl/test-if-str test/scan/test-scan \ test/sequences/test-flist test/sequences/test-mark \ test/whatnow/test-attach-detach test/whatnow/test-cd \ - test/whatnow/test-ls \ + test/whatnow/test-ls test/whom/test-whom \ test/cleanup ## The "cleanup" test should always be last. check_SCRIPTS = test/common.sh -check_PROGRAMS = test/getfullname +check_PROGRAMS = test/getfullname test/getfqdn test/fakesmtp ## ## 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) + etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS) clean-local: @rm -rf RPM a.out.DSYM uip/a.out.DSYM @rm -rf test/testdir @@ -151,8 +164,9 @@ sysconf_DATA = etc/mhn.defaults etc/mts.conf dist_doc_DATA = COPYRIGHT VERSION docs/COMPLETION-BASH docs/COMPLETION-TCSH \ docs/COMPLETION-ZSH docs/DIFFERENCES docs/FAQ \ docs/MAIL.FILTERING docs/MAILING-LISTS docs/README-ATTACHMENTS \ - docs/README-HOOKS docs/README.about docs/README.SASL \ - docs/README.developers docs/README.manpages docs/TODO + docs/README-HOOKS docs/README-components docs/README.about \ + docs/README.SASL docs/README.developers docs/README.manpages \ + docs/TODO ## ## Our man pages @@ -185,20 +199,22 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \ man/conflict.man man/dist.man man/dp.man man/flist.man \ man/flists.man man/fmtdump.man man/fnext.man man/folder.man \ man/folders.man man/forw.man man/fprev.man man/inc.man \ - man/install-mh.man man/mark.man man/mh-alias.man man/mh-chart.man \ - man/mh-draft.man man/mh-format.man man/mh-mail.man \ - man/mh-profile.man man/mh-sequence.man man/mh-tailor.man \ - man/mhbuild.man man/mhl.man man/mhlist.man man/mhmail.man \ - man/mhn.man man/mhparam.man man/mhpath.man man/mhshow.man \ - man/mhstore.man man/msgchk.man man/msh.man man/mts.conf.man \ - man/new.man man/next.man man/nmh.man man/packf.man man/pick.man \ - man/post.man man/prev.man man/prompter.man man/rcvdist.man \ - 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/install-mh.man man/mark.man man/mh-alias.man \ + man/mh-chart-gen.sh man/mh-draft.man man/mh-format.man \ + man/mh-mail.man man/mh-profile.man man/mh-sequence.man \ + man/mh-tailor.man man/mhbuild.man man/mhl.man man/mhlist.man \ + man/mhmail.man man/mhn.man man/mhparam.man man/mhpath.man \ + man/mhshow.man man/mhstore.man man/msgchk.man man/msh.man \ + man/mts.conf.man man/new.man man/next.man man/nmh.man \ + man/packf.man man/pick.man man/post.man man/prev.man \ + man/prompter.man man/rcvdist.man 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 test/README $(TESTS) \ - test/inc/deb359167.mbox test/inc/fromline.txt \ - test/inc/msgheader.txt test/inc/filler.txt test/inc/md5sums + 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 test/post/test-post-common.sh ## ## These are all of the definitions for each of the programs listed above. @@ -214,10 +230,11 @@ uip_burst_SOURCES = uip/burst.c uip_comp_SOURCES = uip/comp.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \ uip/annosbr.c uip/distsbr.c -uip_comp_LDADD = $(LDADD) $(ICONVLIB) +uip_comp_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB) uip_dist_SOURCES = uip/dist.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \ - uip/annosbr.c uip/distsbr.c + uip/annosbr.c uip/distsbr.c uip/forwsbr.c +uip_dist_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB) uip_flist_SOURCES = uip/flist.c @@ -225,7 +242,7 @@ uip_folder_SOURCES = uip/folder.c uip_forw_SOURCES = uip/forw.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \ uip/annosbr.c uip/distsbr.c uip/forwsbr.c -uip_forw_LDADD = $(LDADD) $(ICONVLIB) +uip_forw_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB) uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/termsbr.c \ uip/popsbr.c @@ -285,7 +302,7 @@ uip_refile_SOURCES = uip/refile.c uip_repl_SOURCES = uip/repl.c uip/replsbr.c uip/whatnowproc.c \ uip/whatnowsbr.c uip/sendsbr.c uip/annosbr.c uip/distsbr.c -uip_repl_LDADD = $(LDADD) $(ICONVLIB) +uip_repl_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB) uip_rmf_SOURCES = uip/rmf.c @@ -303,6 +320,7 @@ uip_sortm_SOURCES = uip/sortm.c uip_whatnow_SOURCES = uip/whatnow.c uip/whatnowsbr.c uip/sendsbr.c \ uip/annosbr.c uip/distsbr.c +uip_whatnow_LDADD = $(LDADD) $(READLINELIB) uip_whom_SOURCES = uip/whom.c uip/distsbr.c @@ -351,7 +369,13 @@ uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/mhoutsbr.c uip/sendsbr.c \ uip/annosbr.c uip/distsbr.c test_getfullname_SOURCES = test/getfullname.c -test_getfullname_LDADD = +test_getfullname_LDADD = sbr/libmh.a + +test_getfqdn_SOURCES = test/getfqdn.c +test_getfqdn_LDADD = + +test_fakesmtp_SOURCES = test/fakesmtp.c +test_fakesmtp_LDADD = ## ## Our rebuild rules for files that aren't built via the normal mechanisms @@ -367,7 +391,6 @@ etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile $(SED) -e 's,%mts%,$(MTS),' \ -e 's,%mailspool%,$(mailspool),' \ -e 's,%etcdir%,$(sysconfdir),' \ - -e 's,%masquerade%,$(masquerade),' \ -e 's,%smtpservers%,$(smtpservers),' \ < $(srcdir)/etc/mts.conf.in > $@ @@ -429,7 +452,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/brkstring.c \ sbr/context_replace.c sbr/context_save.c \ sbr/copy.c sbr/copyip.c sbr/cpydata.c \ sbr/cpydgst.c sbr/crawl_folders.c sbr/discard.c \ - sbr/done.c sbr/dtime.c \ + sbr/done.c sbr/dtime.c sbr/escape_display_name.c \ sbr/error.c sbr/ext_hook.c sbr/fdcompare.c \ sbr/folder_addmsg.c sbr/folder_delmsgs.c \ sbr/folder_free.c sbr/folder_pack.c \ @@ -454,7 +477,8 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/brkstring.c \ sbr/snprintb.c sbr/ssequal.c sbr/strcasecmp.c \ sbr/strindex.c sbr/trimcpy.c sbr/uprf.c sbr/vfgets.c \ sbr/fmt_def.c sbr/m_msgdef.c sbr/mf.c sbr/utils.c \ - sbr/m_mktemp.c config/config.c config/version.c + sbr/m_mktemp.c sbr/getansreadline.c config/config.c \ + config/version.c sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \ -DMAILSPOOL='"$(mailspool)"' \ @@ -479,41 +503,38 @@ manext8 = 8 $(man_MANS): man/man.sed man/man.sed: Makefile - echo 's,%nmhwarning%,THIS FILE HAS BEEN AUTOMATICALLY GENERATED. DO NOT EDIT.,g' > $@ - echo 's,%nmhversion%,nmh-$(VERSION),g' >> $@ - echo 's,%nmhdate%,$(DATE),g' >> $@ - echo 's,%bindir%,$(bindir),g' >> $@ - echo 's,%etcdir%,$(sysconfdir),g' >> $@ - echo 's,%libdir%,$(libdir),g' >> $@ - echo 's,%mandir%,$(mandir),g' >> $@ - echo 's,%mailspool%,$(mailspool),g' >> $@ - echo 's,%sendmailpath%,$(sendmailpath),g' >> $@ - echo 's,%default_editor%,$(editorpath),g' >> $@ - echo 's,%default_pager%,$(pagerpath),g' >> $@ - echo 's,%manext1%,$(manext1),g' >> $@ - echo 's,%manext5%,$(manext5),g' >> $@ - echo 's,%manext8%,$(manext8),g' >> $@ - echo '/%components%/r $(top_srcdir)/etc/components' >> $@ - echo ' s,%components%,,g' >> $@ - echo '/%distcomps%/r $(top_srcdir)/etc/distcomps' >> $@ - echo ' s,%distcomps%,,g' >> $@ - echo '/%forwcomps%/r $(top_srcdir)/etc/forwcomps' >> $@ - echo ' s,%forwcomps%,,g' >> $@ - echo '/%mhl_forward%/r $(top_srcdir)/etc/mhl.forward' >> $@ - echo ' s,%mhl_forward%,,g' >> $@ - echo '/%mhl_format%/r $(top_srcdir)/etc/mhl.format' >> $@ - echo ' s,%mhl_format%,,g' >> $@ - echo '/%mhl_reply%/r $(top_srcdir)/etc/mhl.reply' >> $@ - echo ' s,%mhl_reply%,,g' >> $@ + @echo 's,%nmhwarning%,THIS FILE HAS BEEN AUTOMATICALLY GENERATED. DO NOT EDIT.,g' > $@ + @echo 's,%nmhversion%,nmh-$(VERSION),g' >> $@ + @echo 's,%nmhdate%,$(DATE),g' >> $@ + @echo 's,%bindir%,$(bindir),g' >> $@ + @echo 's,%etcdir%,$(sysconfdir),g' >> $@ + @echo 's,%libdir%,$(libdir),g' >> $@ + @echo 's,%mandir%,$(mandir),g' >> $@ + @echo 's,%mailspool%,$(mailspool),g' >> $@ + @echo 's,%sendmailpath%,$(sendmailpath),g' >> $@ + @echo 's,%default_editor%,$(editorpath),g' >> $@ + @echo 's,%default_pager%,$(pagerpath),g' >> $@ + @echo 's,%manext1%,$(manext1),g' >> $@ + @echo 's,%manext5%,$(manext5),g' >> $@ + @echo 's,%manext8%,$(manext8),g' >> $@ + @echo '/%mhl_forward%/r $(top_srcdir)/etc/mhl.forward' >> $@ + @echo ' s,%mhl_forward%,,g' >> $@ + @echo '/%mhl_format%/r $(top_srcdir)/etc/mhl.format' >> $@ + @echo ' s,%mhl_format%,,g' >> $@ + @echo '/%mhl_reply%/r $(top_srcdir)/etc/mhl.reply' >> $@ + @echo ' s,%mhl_reply%,,g' >> $@ + +man/mh-chart.man: + @$(srcdir)/man/mh-chart-gen.sh > $@ .man.$(manext1): - $(SED) -f man/man.sed $< > $@ + @$(SED) -f man/man.sed $< > $@ .man.$(manext5): - $(SED) -f man/man.sed $< > $@ + @$(SED) -f man/man.sed $< > $@ .man.$(manext8): - $(SED) -f man/man.sed $< > $@ + @$(SED) -f man/man.sed $< > $@ ## Don't include commit hashes in ChangeLog. ChangeLog: @@ -550,23 +571,28 @@ cscope: ## ## Use GNU gcov to find the coverage of the test suite. -## gcov and gcov-clean are not integrated into the other automake -## targets because gcov will be used so infrequently, if at all. +## These targets are not integrated into the other automake +## targets because they will be used so infrequently, if at all. ## gcov: - @echo rebuilding with AM_CLFAGS=--coverage . . . + @if ./config.status --config | grep -e --enable-debug >/dev/null; then \ + echo For best results with gcov, configure without --enable-debug; \ + fi + @echo rebuilding with AM_CFLAGS=--coverage . . . @(make clean && make AM_CFLAGS=--coverage) > /dev/null && make check @for i in `find . -name '*.gcda'`; do \ - gcov -o `echo $$i | $(SED) 's%\\(.*\\)/%\\1 %'`; \ + gcov -p -o `echo $$i | $(SED) 's%\\(.*\\)/%\\1 %'`; \ done @for i in `find . -name '*.gcno'`; do \ if ! test -f `echo $$i | sed 's%\.gcno%.gcda%'`; then \ echo untested: $$i; \ fi; \ done -gcov-clean: - @find . -name '*.gcno' -o -name '*.gcda' -o -name '*.gcov' | xargs rm -.PHONY: gcov gcov-clean +gcov-mostlyclean: + @find . -name '*.gcno' -o -name '*.gcda' | xargs rm +gcov-clean: gcov-mostlyclean + @find . -name '*.gcov' | xargs rm +.PHONY: gcov gcov-mostlyclean gcov-clean ##