X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=27ffdfbb14311aface874238f45020d338e31e5e;hb=0c4fc7444c0c5bab8b65bebbd4d939c34220d8dc;hp=389a6b87ffe28a00403d2289c447666caa1bdbeb;hpb=a7b486a1109693152a46f71a0409385c5d6024d4;p=mmh

diff --git a/Makefile.am b/Makefile.am
index 389a6b8..27ffdfb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,6 +55,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	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-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 \
@@ -68,25 +69,26 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	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/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
@@ -161,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
 
 ##
@@ -186,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
@@ -211,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 \
@@ -315,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
 
@@ -392,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 =
 
@@ -415,10 +422,6 @@ etc/mhn.defaults: $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPROG)
 	@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.
@@ -528,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' >> $@