X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=e56cde9e577d774c8b40485dc8c77b38cdc58e30;hb=587e977a97865f091131355f6dd250ece99f7adb;hp=5e91c8a8f77572bd0fc08a0d1f9c9200ade7c65f;hpb=d532d000000ae84fc6b44c2f3d4dfd1d8778b174;p=mmh

diff --git a/Makefile.am b/Makefile.am
index 5e91c8a..e56cde9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,40 +33,46 @@ 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.
 ##
 ## Important note: the "cleanup" test should always be last
 ##
-TESTS = test/bad-input/test-header \
+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/mhlist/test-mhlist test/mhparam/test-mhparam \
-	test/mhpath/test-mhpath \
+	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 \
 	test/mhshow/test-subpart test/mhstore/test-mhstore \
 	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 \
@@ -113,20 +119,22 @@ BUILT_SOURCES = sbr/sigmsg.h
 ##
 bin_PROGRAMS = uip/ali uip/anno uip/burst uip/comp uip/dist uip/flist \
 	       uip/folder uip/forw uip/inc uip/install-mh uip/mark \
-	       uip/mhbuild uip/mhlist uip/mhmail uip/mhn uip/mhparam \
+	       uip/mhbuild uip/mhlist uip/mhn uip/mhparam \
 	       uip/mhpath uip/mhshow uip/mhstore uip/msgchk uip/msh uip/new \
 	       uip/packf uip/pick uip/prompter uip/refile uip/repl uip/rmf \
 	       uip/rmm uip/scan uip/send uip/show uip/sortm uip/whatnow \
 	       uip/whom
 
-bin_SCRIPTS = etc/sendfiles
+bin_SCRIPTS = uip/mhmail etc/sendfiles
 
 ##
 ## This is all programs that get installed in the "lib" directory
 ##
 auxexec_PROGRAMS = uip/ap uip/conflict uip/dp uip/fmtdump uip/mhl uip/post \
 		   uip/rcvdist uip/rcvpack uip/rcvstore uip/rcvtty uip/slocal \
-		   uip/spost uip/viamail uip/mhtest
+		   uip/viamail uip/mhtest
+
+auxexec_SCRIPTS = uip/spost
 
 ##
 ## Internal libraries that we create as part of the build process
@@ -224,9 +232,10 @@ 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/post/test-post-common.sh \
+	     test/inc/md5sums test/mhmail/attachment.txt \
+	     test/post/test-post-common.sh uip/mhmail \
 	     SPECS/nmh.spec SPECS/build-nmh-cygwin
 
 ##
@@ -275,8 +284,6 @@ uip_mhlist_SOURCES = uip/mhlist.c uip/mhparse.c uip/mhcachesbr.c \
 		     uip/md5.c
 uip_mhlist_LDADD = $(LDADD) $(TERMLIB)
 
-uip_mhmail_SOURCES = uip/mhmail.c
-
 uip_mhn_SOURCES = uip/mhn.c uip/mhparse.c uip/mhcachesbr.c uip/mhshowsbr.c \
 		  uip/mhlistsbr.c uip/mhstoresbr.c uip/mhmisc.c uip/mhfree.c \
 		  uip/termsbr.c uip/md5.c
@@ -376,8 +383,6 @@ uip_rcvtty_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
 uip_slocal_SOURCES = uip/slocal.c uip/aliasbr.c uip/dropsbr.c
 uip_slocal_LDADD = $(LDADD) $(NDBM_LIBS)
 
-uip_spost_SOURCES = uip/spost.c uip/aliasbr.c
-
 uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/mhoutsbr.c uip/sendsbr.c \
 		      uip/annosbr.c uip/distsbr.c
 
@@ -400,39 +405,45 @@ sbr/sigmsg.h: $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H)
 	$(AWK) -f $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H) > $@
 
 etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
-	rm -f $@
+	@rm -f $@
 	$(SED) -e 's,%mts%,$(MTS),' \
 	       -e 's,%mailspool%,$(mailspool),' \
 	       -e 's,%smtpservers%,$(smtpservers),' \
 				< $(srcdir)/etc/mts.conf.in > $@
 
 etc/mhn.defaults: $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPROG)
-	rm -f $@
+	@rm -f $@
 	$(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@
 
 etc/sendfiles: $(srcdir)/etc/sendfiles.in Makefile
-	rm -f $@
+	@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.
+##
+LN = @LN@
+
+##
 ## This rule gets called at "make install" time; we use it to create links
 ## between different programs.
 ##
 install-exec-hook:
-	rm -f $(DESTDIR)$(bindir)/flists$(EXEEXT)
-	rm -f $(DESTDIR)$(bindir)/folders$(EXEEXT)
-	rm -f $(DESTDIR)$(bindir)/fnext$(EXEEXT)
-	rm -f $(DESTDIR)$(bindir)/fprev$(EXEEXT)
-	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)
+	@rm -f $(DESTDIR)$(bindir)/flists$(EXEEXT)
+	@rm -f $(DESTDIR)$(bindir)/folders$(EXEEXT)
+	@rm -f $(DESTDIR)$(bindir)/fnext$(EXEEXT)
+	@rm -f $(DESTDIR)$(bindir)/fprev$(EXEEXT)
+	@rm -f $(DESTDIR)$(bindir)/unseen$(EXEEXT)
+	@rm -f $(DESTDIR)$(bindir)/prev$(EXEEXT)
+	@rm -f $(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 \