X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=a8d14b36682d27a46e3f786997dd813870d5af8b;hb=356f49083391bd018b6c5dfed21e59247b4cc74a;hp=31e710995051ae2e2f76242724406d434a74ae82;hpb=1186f294d7e907788140fd71bbd4d375fa24c2e8;p=mmh

diff --git a/Makefile.am b/Makefile.am
index 31e7109..a8d14b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,10 +33,10 @@ auxexecdir = @libdir@
 ##
 ## nmh _does_ have a test suite!
 ##
-TESTS_ENVIRONMENT = MH_OBJ_DIR=@abs_builddir@ \
-		    MH_TEST_DIR=@abs_builddir@/test/testdir \
-		    auxexecdir=$(auxexecdir) bindir=$(bindir) \
-		    mandir=$(mandir) sysconfdir=$(sysconfdir) \
+TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_builddir@" \
+		    MH_TEST_DIR="@abs_builddir@/test/testdir" \
+		    auxexecdir="$(auxexecdir)" bindir="$(bindir)" \
+		    mandir="$(mandir)" sysconfdir="$(sysconfdir)" \
 		    MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \
 		    $(TESTS_SHELL) ## Keep at end of TESTS_ENVIRONMENT.
 ##
@@ -46,15 +46,17 @@ TESTS = test/ali/test-ali \
 	test/bad-input/test-header \
 	test/burst/test-burst \
 	test/comp/test-comp-format \
-	test/folder/test-create \
-	test/folder/test-total 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/folder/test-create test/folder/test-packf \
+	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/mhbuild/test-forw \
+	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 \
 	test/mhshow/test-cte-binary test/mhshow/test-qp \
@@ -62,12 +64,15 @@ TESTS = test/ali/test-ali \
 	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-dcc test/post/test-post-fcc \
 	test/post/test-post-multifrom test/post/test-post-envelope \
-	test/post/test-post-group \
+	test/post/test-post-group test/post/test-mts test/post/test-messageid \
+	test/prompter/test-prompter \
+	test/rcv/test-rcvdist test/rcv/test-rcvpack test/rcv/test-rcvstore \
 	test/refile/test-refile \
 	test/repl/test-if-str test/repl/test-trailing-newline \
-	test/repl/test-multicomp \
+	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/whatnow/test-attach-detach test/whatnow/test-cd \
@@ -225,7 +230,7 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \
 	     man/rmf.man man/rmm.man man/scan.man man/send.man \
 	     man/sendfiles.man man/show.man man/slocal.man man/sortm.man \
 	     man/unseen.man man/whatnow.man man/whom.man \
-	     test/README $(TESTS) test/inc/deb359167.mbox \
+	     test/README test/fakesendmail $(TESTS) test/inc/deb359167.mbox \
 	     test/inc/fromline.txt test/inc/msgheader.txt test/inc/filler.txt \
 	     test/inc/md5sums test/mhmail/attachment.txt \
 	     test/post/test-post-common.sh uip/mhmail \
@@ -415,6 +420,12 @@ etc/sendfiles: $(srcdir)/etc/sendfiles.in Makefile
 	$(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.
+##
+LN = @LN@
+
+##
 ## This rule gets called at "make install" time; we use it to create links
 ## between different programs.
 ##
@@ -426,13 +437,13 @@ install-exec-hook:
 	rm -f $(DESTDIR)$(bindir)/unseen$(EXEEXT)
 	rm -f $(DESTDIR)$(bindir)/prev$(EXEEXT)
 	rm -f $(DESTDIR)$(bindir)/next$(EXEEXT)
-	@LINK_FILE@ $(DESTDIR)$(bindir)/flist$(EXEEXT) $(DESTDIR)$(bindir)/flists$(EXEEXT)
-	@LINK_FILE@ $(DESTDIR)$(bindir)/folder$(EXEEXT) $(DESTDIR)$(bindir)/folders$(EXEEXT)
-	@LINK_FILE@ $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/fnext$(EXEEXT)
-	@LINK_FILE@ $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/fprev$(EXEEXT)
-	@LINK_FILE@ $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/unseen$(EXEEXT)
-	@LINK_FILE@ $(DESTDIR)$(bindir)/show$(EXEEXT) $(DESTDIR)$(bindir)/prev$(EXEEXT)
-	@LINK_FILE@ $(DESTDIR)$(bindir)/show$(EXEEXT) $(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)
+	$(LN) $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/fprev$(EXEEXT)
+	$(LN) $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/unseen$(EXEEXT)
+	$(LN) $(DESTDIR)$(bindir)/show$(EXEEXT) $(DESTDIR)$(bindir)/prev$(EXEEXT)
+	$(LN) $(DESTDIR)$(bindir)/show$(EXEEXT) $(DESTDIR)$(bindir)/next$(EXEEXT)
 	if test x$(SETGID_MAIL) != x; then \
 		chgrp $(MAIL_SPOOL_GRP) $(DESTDIR)$(bindir)/inc$(EXEEXT) && \
 		chmod 2755 $(DESTDIR)$(bindir)/inc$(EXEEXT); \
@@ -453,15 +464,15 @@ uninstall-hook:
 ##
 ## Our rules to build our internal libraries (libmh.a, libmts.a)
 ##
-sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/brkstring.c \
-		      sbr/check_charset.c sbr/client.c sbr/closefds.c \
-		      sbr/concat.c sbr/context_del.c sbr/context_find.c \
-		      sbr/context_foil.c sbr/context_read.c \
+sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/base64.c \
+		      sbr/brkstring.c sbr/check_charset.c sbr/client.c \
+		      sbr/closefds.c sbr/concat.c sbr/context_del.c \
+		      sbr/context_find.c sbr/context_foil.c sbr/context_read.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/escape_addresses.c \
-		      sbr/error.c  sbr/ext_hook.c sbr/fdcompare.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 \
 		      sbr/folder_read.c sbr/folder_realloc.c sbr/gans.c \
@@ -471,8 +482,9 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/brkstring.c \
 		      sbr/fmt_rfc2047.c sbr/fmt_scan.c sbr/lock_file.c \
 		      sbr/m_atoi.c sbr/m_backup.c sbr/m_convert.c \
 		      sbr/m_draft.c sbr/m_getfld.c sbr/m_gmprot.c \
-		      sbr/m_maildir.c sbr/m_name.c \
-		      sbr/makedir.c sbr/mts.c sbr/norm_charmap.c sbr/path.c \
+		      sbr/m_maildir.c sbr/m_name.c sbr/m_rand.c \
+		      sbr/makedir.c sbr/message_id.c sbr/mts.c \
+		      sbr/norm_charmap.c sbr/path.c \
 		      sbr/peekc.c sbr/pidwait.c sbr/pidstatus.c \
 		      sbr/print_help.c sbr/print_sw.c sbr/print_version.c \
 		      sbr/push.c sbr/putenv.c sbr/refile.c sbr/remdir.c \