X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=265bef625786445818f0abd745fba90b4af30253;hb=aa520b835b4f260ecd8da6ed8fe2d5dfa845c44e;hp=2dbab2f636624086b26c20c129739e1e5f5d0cd1;hpb=7cc0e9952d85f30d1d8ce85cc7a9eb0a5e52e202;p=mmh diff --git a/Makefile.am b/Makefile.am index 2dbab2f..265bef6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,6 +50,7 @@ TESTS = test/bad-input/test-header \ 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/install-mh/test-install-mh \ test/manpages/test-manpages test/mhbuild/test-forw \ test/mhlist/test-mhlist test/mhparam/test-mhparam \ test/mhpath/test-mhpath \ @@ -62,10 +63,12 @@ TESTS = test/bad-input/test-header \ 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/repl/test-if-str test/repl/test-trailing-newline \ + test/repl/test-multicomp \ + 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 @@ -133,7 +136,7 @@ noinst_LIBRARIES = sbr/libmh.a sbr/libdtimep.a mts/libmts.a ## them, but that might change in the future. ## noinst_HEADERS = h/addrsbr.h h/aliasbr.h h/crawl_folders.h h/dropsbr.h \ - h/fmt_compile.h h/fmt_scan.h h/m_setjmp.h h/md5.h h/mf.h \ + h/fmt_compile.h h/fmt_scan.h h/md5.h h/mf.h \ h/mh.h h/mhcachesbr.h h/mhparse.h h/mime.h h/msh.h \ h/mts.h h/nmh.h h/picksbr.h h/popsbr.h h/prototypes.h \ h/rcvmail.h h/scansbr.h h/signals.h h/tws.h h/utils.h \ @@ -168,6 +171,12 @@ dist_doc_DATA = COPYRIGHT VERSION docs/COMPLETION-BASH docs/COMPLETION-TCSH \ docs/TODO ## +## Contribs that get installed in docdir/contrib/ +## +contribdir = $(docdir)/contrib +dist_contrib_DATA = docs/contrib/nmh.spec docs/contrib/replyfilter + +## ## Our man pages ## man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \ @@ -191,7 +200,7 @@ man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \ ## Automake using the automatic rules ## EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \ - etc/mhn.defaults.sh $(MHNSEARCHPROG) nmh.spec DATE \ + etc/mhn.defaults.sh $(MHNSEARCHPROG) DATE \ docs/ChangeLog_MH-3_to_MH-6.6 \ docs/ChangeLog_MH-6.7.0_to_MH-6.8.4.html \ man/ali.man man/anno.man man/ap.man man/burst.man man/comp.man \ @@ -229,11 +238,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/forwsbr.c -uip_dist_LDADD = $(LDADD) $(ICONVLIB) +uip_dist_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB) uip_flist_SOURCES = uip/flist.c @@ -241,7 +250,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 @@ -301,7 +310,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 @@ -319,6 +328,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 @@ -367,7 +377,7 @@ 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 = @@ -388,9 +398,8 @@ etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile rm -f $@ $(SED) -e 's,%mts%,$(MTS),' \ -e 's,%mailspool%,$(mailspool),' \ - -e 's,%etcdir%,$(sysconfdir),' \ -e 's,%smtpservers%,$(smtpservers),' \ - < $(srcdir)/etc/mts.conf.in > $@ + < $(srcdir)/etc/mts.conf.in > $@ etc/mhn.defaults: $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPROG) rm -f $@ @@ -450,7 +459,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 \ @@ -461,7 +470,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/brkstring.c \ sbr/fmt_rfc2047.c sbr/fmt_scan.c sbr/lock_file.c \ sbr/m_atoi.c sbr/m_backup.c sbr/m_convert.c \ sbr/m_draft.c sbr/m_getfld.c sbr/m_gmprot.c \ - sbr/m_maildir.c sbr/m_name.c sbr/m_setjmp.c \ + sbr/m_maildir.c sbr/m_name.c \ sbr/makedir.c sbr/mts.c sbr/norm_charmap.c sbr/path.c \ sbr/peekc.c sbr/pidwait.c sbr/pidstatus.c \ sbr/print_help.c sbr/print_sw.c sbr/print_version.c \ @@ -475,7 +484,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)"' \ @@ -485,9 +495,11 @@ sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \ -DDEFAULT_PAGER='"$(pagerpath)"' sbr_libdtimep_a_SOURCES = sbr/dtimep.l -sbr_libdtimep_a_CFLAGS = $(sbr_libmh_a_CPPFLAGS) $(DISABLE_UNUSED_MACROS_WARNING) +sbr_libdtimep_a_CFLAGS = $(sbr_libmh_a_CPPFLAGS) \ + $(DISABLE_UNUSED_MACROS_WARNING) \ + $(DISABLE_SIGN_COMPARE_WARNING) -mts_libmts_a_SOURCES = mts/smtp/hosts.c mts/smtp/smtp.c +mts_libmts_a_SOURCES = mts/smtp/smtp.c ## ## Our rules for generating man pages (both the rule for man.sed and @@ -550,7 +562,7 @@ rpm: dist @test -d $(rpmdir)/SPECS || $(MKDIR_P) $(rpmdir)/SPECS @mv -f $(DIST_ARCHIVES) $(rpmdir)/SOURCES @cp -p VERSION $(rpmdir)/SOURCES - @cp -p nmh.spec $(rpmdir)/SPECS + @cp -p docs/contrib/nmh.spec $(rpmdir)/SPECS @rpmbuild --define '_topdir $(rpmdir)' \ --define '_tmppath %{_topdir}/TMP' \ --define "_sysconfdir $(DESTDIR)$(sysconfdir)" \ @@ -562,7 +574,7 @@ 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 + find $(srcdir) \( -name docs -prune \) -o \( -name \*.c -o -name \*.l \) -print | grep -v dtimep.c >> cscope.files .PHONY: cscope @@ -572,8 +584,12 @@ cscope: ## targets because they will be used so infrequently, if at all. ## gcov: - @echo rebuilding with AM_CLFAGS=--coverage . . . - @(make clean && make AM_CFLAGS=--coverage) > /dev/null && make check + @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 AM_CFLAGS=--coverage @for i in `find . -name '*.gcda'`; do \ gcov -p -o `echo $$i | $(SED) 's%\\(.*\\)/%\\1 %'`; \ done @@ -609,5 +625,5 @@ upload: dist chmod 664 $(DIST_ARCHIVES).sig; \ fi @echo "Uploading to savannah" - scp -p $(DIST_ARCHIVES)* $(SAVANNAH_USERNAME)@savannah.gnu.org:/releases/nmh + scp -p $(DIST_ARCHIVES)* $(SAVANNAH_USERNAME)@dl.sv.nongnu.org:/releases/nmh .PHONY: upload