X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=dbb5ec81a16e6811348d97158662c74d4017fd12;hb=ee8a311403280f7aefb1fb727ccbc6a9d98cce89;hp=c781eb22850cabf2dba317fe91d37979c6ff3c00;hpb=38927b66e5517a1fc730ea2b416ad4ad03c427a3;p=mmh

diff --git a/Makefile.am b/Makefile.am
index c781eb2..dbb5ec8 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,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 \
@@ -165,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
@@ -229,11 +232,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 +244,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 +304,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 +322,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 +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 =
@@ -388,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 $@
@@ -450,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 \
@@ -475,7 +478,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)"' \
@@ -487,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
@@ -576,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