X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=27ffdfbb14311aface874238f45020d338e31e5e;hb=e69044f7624abe5cb2cb796d528c0cc5f29515f7;hp=d64fa3cd79b942839c78043c6219cb81dfaca151;hpb=603d80d3a5fb399830d589406a5f55f280b0bcb5;p=mmh diff --git a/Makefile.am b/Makefile.am index d64fa3c..27ffdfb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,54 +33,62 @@ auxexecdir = @libdir@ ## ## nmh _does_ have a test suite! ## -TESTS_ENVIRONMENT = MH_OBJ_DIR=@abs_builddir@ \ - MH_TEST_DIR=@abs_builddir@/test/testdir \ - auxexecdir=$(auxexecdir) bindir=$(bindir) \ - mandir=$(mandir) sysconfdir=$(sysconfdir) \ +TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_builddir@" \ + MH_TEST_DIR="@abs_builddir@/test/testdir" \ + auxexecdir="$(auxexecdir)" bindir="$(bindir)" \ + mandir="$(mandir)" sysconfdir="$(sysconfdir)" \ MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \ $(TESTS_SHELL) ## Keep at end of TESTS_ENVIRONMENT. ## ## Important note: the "cleanup" test should always be last ## -TESTS = test/bad-input/test-header \ +TESTS = test/ali/test-ali test/anno/test-anno \ + 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/comp/test-comp-format test/dist/test-dist \ + test/folder/test-create test/folder/test-packf \ + test/folder/test-recurse test/folder/test-sortm \ + test/folder/test-total \ + test/format/test-dp test/format/test-fmtdump \ + 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/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 \ + test/inc/test-inc-scanout test/inc/test-msgchk \ + test/inc/test-pop \ + test/install-mh/test-install-mh test/manpages/test-manpages \ + test/mhbuild/test-forw test/mhbuild/test-utf8-body \ + test/mhlist/test-mhlist test/mhmail/test-mhmail \ + test/mhparam/test-mhparam test/mhpath/test-mhpath \ test/mhshow/test-cte-binary test/mhshow/test-qp \ 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-aliases test/post/test-post-basic \ + test/post/test-post-multiple test/post/test-post-bcc \ 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/post/test-post-group test/post/test-mts test/post/test-messageid \ + test/post/test-sendfiles test/prompter/test-prompter \ + test/rcv/test-rcvdist test/rcv/test-rcvpack test/rcv/test-rcvstore \ + test/rcv/test-rcvtty test/refile/test-refile \ test/repl/test-if-str test/repl/test-trailing-newline \ - test/repl/test-multicomp \ + test/repl/test-multicomp test/repl/test-repl \ test/scan/test-scan test/scan/test-scan-multibyte \ test/sequences/test-flist test/sequences/test-mark \ + test/slocal/test-slocal \ test/whatnow/test-attach-detach test/whatnow/test-cd \ 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 test/getfqdn test/fakesmtp +check_PROGRAMS = test/getfullname test/getfqdn test/fakepop test/fakesmtp DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1 ## ## Stuff that should be cleaned via "make clean" ## -CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf etc/sendfiles \ +CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf \ etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS) clean-local: @rm -rf RPM a.out.dSYM uip/a.out.dSYM @@ -96,7 +104,7 @@ MAINTAINERCLEANFILES = cscope.files cscope.out ## 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 + install-sh missing ylwrap nmh-*.tar.gz nmh-*.tar.gz.sig superclean: maintainer-clean @rm -f $(SUPERCLEANFILES) .PHONY: superclean @@ -113,20 +121,22 @@ BUILT_SOURCES = sbr/sigmsg.h ## bin_PROGRAMS = uip/ali uip/anno uip/burst uip/comp uip/dist uip/flist \ uip/folder uip/forw uip/inc uip/install-mh uip/mark \ - uip/mhbuild uip/mhlist uip/mhmail uip/mhn uip/mhparam \ + uip/mhbuild uip/mhlist uip/mhn uip/mhparam \ uip/mhpath uip/mhshow uip/mhstore uip/msgchk uip/msh uip/new \ uip/packf uip/pick uip/prompter uip/refile uip/repl uip/rmf \ uip/rmm uip/scan uip/send uip/show uip/sortm uip/whatnow \ uip/whom -bin_SCRIPTS = etc/sendfiles +bin_SCRIPTS = uip/mhmail etc/sendfiles ## ## This is all programs that get installed in the "lib" directory ## auxexec_PROGRAMS = uip/ap uip/conflict uip/dp uip/fmtdump uip/mhl uip/post \ uip/rcvdist uip/rcvpack uip/rcvstore uip/rcvtty uip/slocal \ - uip/spost uip/viamail uip/mhtest + uip/viamail uip/mhtest + +auxexec_SCRIPTS = uip/spost ## ## Internal libraries that we create as part of the build process @@ -153,8 +163,8 @@ dist_sysconf_DATA = etc/MailAliases etc/components etc/digestcomps \ etc/mhl.format etc/mhl.forward etc/mhl.headers \ etc/mhl.reply etc/rcvdistcomps etc/rcvdistcomps.outbox \ etc/replcomps etc/replgroupcomps etc/scan.MMDDYY \ - etc/scan.YYYYMMDD etc/scan.default etc/scan.mailx \ - etc/scan.nomime etc/scan.size etc/scan.time \ + etc/scan.YYYYMMDD etc/scan.default etc/scan.highlighted \ + etc/scan.mailx etc/scan.nomime etc/scan.size etc/scan.time \ etc/scan.timely etc/scan.unseen ## @@ -178,7 +188,8 @@ dist_doc_DATA = COPYRIGHT INSTALL NEWS README VERSION \ ## Contribs that get installed in docdir/contrib/ ## contribdir = $(docdir)/contrib -dist_contrib_DATA = docs/contrib/replyfilter docs/contrib/build_nmh +dist_contrib_DATA = docs/contrib/replyfilter docs/contrib/build_nmh \ + docs/contrib/ml ## ## Our man pages @@ -203,8 +214,8 @@ man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \ ## Files we need to include in the distribution which aren't found by ## 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) DATE MACHINES \ +EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in \ + etc/mhn.defaults.sh etc/sendfiles $(MHNSEARCHPROG) DATE MACHINES \ 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 \ @@ -224,9 +235,10 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \ 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/README test/fakesendmail $(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 \ + test/inc/md5sums test/mhmail/attachment.txt \ + test/post/test-post-common.sh uip/mhmail \ SPECS/nmh.spec SPECS/build-nmh-cygwin ## @@ -275,8 +287,6 @@ uip_mhlist_SOURCES = uip/mhlist.c uip/mhparse.c uip/mhcachesbr.c \ uip/md5.c uip_mhlist_LDADD = $(LDADD) $(TERMLIB) -uip_mhmail_SOURCES = uip/mhmail.c - uip_mhn_SOURCES = uip/mhn.c uip/mhparse.c uip/mhcachesbr.c uip/mhshowsbr.c \ uip/mhlistsbr.c uip/mhstoresbr.c uip/mhmisc.c uip/mhfree.c \ uip/termsbr.c uip/md5.c @@ -308,6 +318,7 @@ uip_new_SOURCES = uip/new.c uip_packf_SOURCES = uip/packf.c uip/dropsbr.c uip_pick_SOURCES = uip/pick.c uip/picksbr.c +uip_pick_LDADD = $(LDADD) $(ICONVLIB) uip_prompter_SOURCES = uip/prompter.c @@ -376,8 +387,6 @@ uip_rcvtty_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) uip_slocal_SOURCES = uip/slocal.c uip/aliasbr.c uip/dropsbr.c uip_slocal_LDADD = $(LDADD) $(NDBM_LIBS) -uip_spost_SOURCES = uip/spost.c uip/aliasbr.c - uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/mhoutsbr.c uip/sendsbr.c \ uip/annosbr.c uip/distsbr.c @@ -387,6 +396,9 @@ test_getfullname_LDADD = sbr/libmh.a test_getfqdn_SOURCES = test/getfqdn.c test_getfqdn_LDADD = +test_fakepop_SOURCES = test/fakepop.c +test_fakepop_LDADD = + test_fakesmtp_SOURCES = test/fakesmtp.c test_fakesmtp_LDADD = @@ -400,59 +412,41 @@ sbr/sigmsg.h: $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H) $(AWK) -f $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H) > $@ etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile - rm -f $@ + @rm -f $@ $(SED) -e 's,%mts%,$(MTS),' \ -e 's,%mailspool%,$(mailspool),' \ -e 's,%smtpservers%,$(smtpservers),' \ < $(srcdir)/etc/mts.conf.in > $@ etc/mhn.defaults: $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPROG) - rm -f $@ + @rm -f $@ $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@ -etc/sendfiles: $(srcdir)/etc/sendfiles.in Makefile - rm -f $@ - $(SED) -e 's,%libdir%,$(libdir),' < $(srcdir)/etc/sendfiles.in > $@ +## +## Use configure to set up default LN, but through a make variable so +## that it can be overridden at install time. +## +LN = @LN@ ## ## This rule gets called at "make install" time; we use it to create links ## between different programs. -## On Cygwin, the choice of ln or ln -s must be made at install time, -## not configure time, because some filesystems (NTFS) support hard -## links but others (FAT32) don't. The fallback to cp -p might not be -## needed, but it's here just in case. ## install-exec-hook: - rm -f $(DESTDIR)$(bindir)/flists$(EXEEXT) - rm -f $(DESTDIR)$(bindir)/folders$(EXEEXT) - rm -f $(DESTDIR)$(bindir)/fnext$(EXEEXT) - rm -f $(DESTDIR)$(bindir)/fprev$(EXEEXT) - rm -f $(DESTDIR)$(bindir)/unseen$(EXEEXT) - rm -f $(DESTDIR)$(bindir)/prev$(EXEEXT) - rm -f $(DESTDIR)$(bindir)/next$(EXEEXT) - cd $(DESTDIR)$(bindir) && \ - if ln flist$(EXEEXT) flists$(EXEEXT) 2>/dev/null && \ - ln folder$(EXEEXT) folders$(EXEEXT) && \ - ln new$(EXEEXT) fnext$(EXEEXT) && \ - ln new$(EXEEXT) fprev$(EXEEXT) && \ - ln new$(EXEEXT) unseen$(EXEEXT) && \ - ln show$(EXEEXT) prev$(EXEEXT) && \ - ln show$(EXEEXT) next$(EXEEXT); then :; \ - elif ln -s flist$(EXEEXT) flists$(EXEEXT) 2>/dev/null && \ - ln -s folder$(EXEEXT) folders$(EXEEXT) && \ - ln -s new$(EXEEXT) fnext$(EXEEXT) && \ - ln -s new$(EXEEXT) fprev$(EXEEXT) && \ - ln -s new$(EXEEXT) unseen$(EXEEXT) && \ - ln -s show$(EXEEXT) prev$(EXEEXT) && \ - ln -s show$(EXEEXT) next$(EXEEXT); then :; \ - else cp -p flist$(EXEEXT) flists$(EXEEXT) && \ - cp -p folder$(EXEEXT) folders$(EXEEXT) && \ - cp -p new$(EXEEXT) fnext$(EXEEXT) && \ - cp -p new$(EXEEXT) fprev$(EXEEXT) && \ - cp -p new$(EXEEXT) unseen$(EXEEXT) && \ - cp -p show$(EXEEXT) prev$(EXEEXT) && \ - cp -p show$(EXEEXT) next$(EXEEXT); \ - fi + @rm -f $(DESTDIR)$(bindir)/flists$(EXEEXT) + @rm -f $(DESTDIR)$(bindir)/folders$(EXEEXT) + @rm -f $(DESTDIR)$(bindir)/fnext$(EXEEXT) + @rm -f $(DESTDIR)$(bindir)/fprev$(EXEEXT) + @rm -f $(DESTDIR)$(bindir)/unseen$(EXEEXT) + @rm -f $(DESTDIR)$(bindir)/prev$(EXEEXT) + @rm -f $(DESTDIR)$(bindir)/next$(EXEEXT) + $(LN) $(DESTDIR)$(bindir)/flist$(EXEEXT) $(DESTDIR)$(bindir)/flists$(EXEEXT) + $(LN) $(DESTDIR)$(bindir)/folder$(EXEEXT) $(DESTDIR)$(bindir)/folders$(EXEEXT) + $(LN) $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/fnext$(EXEEXT) + $(LN) $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/fprev$(EXEEXT) + $(LN) $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/unseen$(EXEEXT) + $(LN) $(DESTDIR)$(bindir)/show$(EXEEXT) $(DESTDIR)$(bindir)/prev$(EXEEXT) + $(LN) $(DESTDIR)$(bindir)/show$(EXEEXT) $(DESTDIR)$(bindir)/next$(EXEEXT) if test x$(SETGID_MAIL) != x; then \ chgrp $(MAIL_SPOOL_GRP) $(DESTDIR)$(bindir)/inc$(EXEEXT) && \ chmod 2755 $(DESTDIR)$(bindir)/inc$(EXEEXT); \ @@ -473,15 +467,15 @@ uninstall-hook: ## ## Our rules to build our internal libraries (libmh.a, libmts.a) ## -sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/brkstring.c \ - sbr/check_charset.c sbr/client.c sbr/closefds.c \ - sbr/concat.c sbr/context_del.c sbr/context_find.c \ - sbr/context_foil.c sbr/context_read.c \ +sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/base64.c \ + sbr/brkstring.c sbr/check_charset.c sbr/client.c \ + sbr/closefds.c sbr/concat.c sbr/context_del.c \ + sbr/context_find.c sbr/context_foil.c sbr/context_read.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/escape_addresses.c \ - sbr/error.c sbr/ext_hook.c sbr/fdcompare.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 \ sbr/folder_read.c sbr/folder_realloc.c sbr/gans.c \ @@ -491,8 +485,9 @@ 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/makedir.c sbr/mts.c sbr/norm_charmap.c sbr/path.c \ + sbr/m_maildir.c sbr/m_name.c sbr/m_rand.c \ + sbr/makedir.c sbr/message_id.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 \ sbr/push.c sbr/putenv.c sbr/refile.c sbr/remdir.c \ @@ -536,7 +531,6 @@ $(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' >> $@ @@ -557,19 +551,26 @@ man/man.sed: Makefile @echo ' s,%mhl_reply%,,g' >> $@ man/mh-chart.man: - @$(srcdir)/man/mh-chart-gen.sh > $@ + $(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.$(manext7): - @$(SED) -f man/man.sed $< > $@ + $(SED) -f man/man.sed $< > $@ .man.$(manext8): - @$(SED) -f man/man.sed $< > $@ + $(SED) -f man/man.sed $< > $@ + +man: $(man_MANS) + +cleanman: + rm -f $(man_MANS) + +.PHONY: man cleanman ## Don't include commit hashes in ChangeLog. ChangeLog: @@ -641,7 +642,7 @@ upload: dist @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); \ + gpg --output $(DIST_ARCHIVES).sig --detach-sig $(DIST_ARCHIVES); \ fi @echo "Setting permissions for savannah.gnu.org" chmod 664 $(DIST_ARCHIVES)