X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=27ffdfbb14311aface874238f45020d338e31e5e;hb=0c4fc7444c0c5bab8b65bebbd4d939c34220d8dc;hp=5fc505ef1c7182848e84599b1f4889484cc4549e;hpb=783f7afc3d5817828604b7f441d9de45b80f9aa6;p=mmh diff --git a/Makefile.am b/Makefile.am index 5fc505e..27ffdfb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,19 +42,21 @@ TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_builddir@" \ ## ## Important note: the "cleanup" test should always be last ## -TESTS = test/ali/test-ali \ +TESTS = test/ali/test-ali test/anno/test-anno \ test/bad-input/test-header \ test/burst/test-burst \ - test/comp/test-comp-format \ + test/comp/test-comp-format test/dist/test-dist \ test/folder/test-create test/folder/test-packf \ - test/folder/test-sortm test/folder/test-total \ + 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/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 \ @@ -62,30 +64,31 @@ TESTS = test/ali/test-ali \ 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-bcc \ + 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/post/test-mts test/post/test-messageid \ - test/prompter/test-prompter \ + test/post/test-sendfiles test/prompter/test-prompter \ test/rcv/test-rcvdist test/rcv/test-rcvpack test/rcv/test-rcvstore \ - test/refile/test-refile \ + 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-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 @@ -131,7 +134,9 @@ bin_SCRIPTS = uip/mhmail etc/sendfiles ## 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 @@ -158,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 ## @@ -183,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 @@ -208,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 \ @@ -312,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 @@ -380,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 @@ -391,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 = @@ -404,20 +412,16 @@ 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. @@ -429,13 +433,13 @@ LN = @LN@ ## between different programs. ## 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) + @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) @@ -527,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' >> $@ @@ -548,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: