X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=dbb5ec81a16e6811348d97158662c74d4017fd12;hb=ee8a311403280f7aefb1fb727ccbc6a9d98cce89;hp=14d1dd1400b1d3ef376db3cc2db1d28654d2e8c1;hpb=3a85e0bc9c72935ca9d154b3aa3093c31ed1836e;p=mmh

diff --git a/Makefile.am b/Makefile.am
index 14d1dd1..dbb5ec8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,7 +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/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 \
@@ -63,7 +63,9 @@ 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/whom/test-whom \
@@ -166,7 +168,7 @@ dist_doc_DATA = COPYRIGHT VERSION docs/COMPLETION-BASH docs/COMPLETION-TCSH \
 		docs/MAIL.FILTERING docs/MAILING-LISTS docs/README-ATTACHMENTS \
 		docs/README-HOOKS docs/README-components docs/README.about \
 		docs/README.SASL docs/README.developers docs/README.manpages \
-		docs/TODO
+		docs/TODO docs/replyfilter
 
 ##
 ## Our man pages
@@ -369,7 +371,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 =
@@ -390,9 +392,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 $@
@@ -452,7 +453,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 \
@@ -490,7 +491,7 @@ sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
 sbr_libdtimep_a_SOURCES = sbr/dtimep.l
 sbr_libdtimep_a_CFLAGS = $(sbr_libmh_a_CPPFLAGS) $(DISABLE_UNUSED_MACROS_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
@@ -579,7 +580,8 @@ gcov:
 	   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
+	@(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