X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=27ffdfbb14311aface874238f45020d338e31e5e;hb=e69044f7624abe5cb2cb796d528c0cc5f29515f7;hp=836c37f17d1755a233df7f235079b90c3eac9703;hpb=f8baa5a34335fc0fc8ccabfabc601d0af73ab769;p=mmh

diff --git a/Makefile.am b/Makefile.am
index 836c37f..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 \
@@ -75,12 +76,13 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	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
 
 ##
@@ -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
@@ -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 =
 
@@ -524,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' >> $@