X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2863aba03e380b0b80d6c4bc3368452ab4d49008..51919715ad7a57f2c74854a6d3d6374578f46985:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e6db2075..a098c0a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,7 +109,8 @@ DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1
 ##
 CLEANFILES = config/version.c sbr/sigmsg.h sbr/dtimep.c etc/mts.conf \
 	     etc/gen-ctype-checked sbr/ctype-checked.h sbr/ctype-checked.c \
-	     etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS)
+	     etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS) \
+	     *.plist
 clean-local:
 	@rm -rf RPM a.out.dSYM uip/a.out.dSYM
 	@rm -rf test/testdir
@@ -117,7 +118,7 @@ clean-local:
 ##
 ## Stuff that should be cleaned via "make maintainer-clean"
 ##
-MAINTAINERCLEANFILES = cscope.files cscope.out cscope.in.out cscope.po.out
+MAINTAINERCLEANFILES = cscope.files cscope.out cscope.in.out cscope.po.out *.plist
 
 ##
 ## And our own superclean, to get everything left by maintainer-clean.
@@ -143,7 +144,7 @@ bin_PROGRAMS = uip/ali uip/anno uip/burst uip/comp uip/dist uip/flist \
 	       uip/fmttest uip/folder uip/forw uip/inc uip/install-mh \
 	       uip/mark uip/mhbuild uip/mhfixmsg 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/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
 
@@ -177,10 +178,10 @@ noinst_LIBRARIES = sbr/libmh.a mts/libmts.a
 ##
 noinst_HEADERS = h/addrsbr.h h/aliasbr.h h/crawl_folders.h h/dropsbr.h \
 		 h/fmt_compile.h h/fmt_scan.h h/md5.h h/mf.h \
-		 h/mh.h h/mhcachesbr.h h/mhparse.h h/mime.h h/msh.h \
+		 h/mh.h h/mhcachesbr.h h/mhparse.h h/mime.h \
 		 h/mts.h h/nmh.h h/picksbr.h h/popsbr.h h/prototypes.h \
 		 h/rcvmail.h h/scansbr.h h/signals.h h/tws.h h/utils.h \
-		 h/vmhsbr.h mts/smtp/smtp.h sbr/ctype-checked.h
+		 mts/smtp/smtp.h sbr/ctype-checked.h
 
 ##
 ## Extra files we need to install in various places
@@ -232,7 +233,7 @@ man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \
 	   man/mh_profile.5 man/mh-sequence.5 man/mh-tailor.5 man/mhbuild.1 \
 	   man/mhfixmsg.1 man/mhl.1 man/mhlist.1 man/mhmail.1 man/mhn.1 \
 	   man/mhparam.1 man/mhpath.1 man/mhshow.1 man/mhstore.1 \
-	   man/mh-mkstemp.1 man/msgchk.1 man/msh.1 man/mts.conf.5 man/new.1 \
+	   man/mh-mkstemp.1 man/msgchk.1 man/mts.conf.5 man/new.1 \
 	   man/next.1 man/nmh.7 man/packf.1 man/pick.1 man/post.8 man/prev.1 \
 	   man/prompter.1 man/rcvdist.1 man/rcvpack.1 man/rcvstore.1 \
 	   man/rcvtty.1 man/refile.1 man/repl.1 man/rmf.1 man/rmm.1 \
@@ -253,7 +254,7 @@ man_SRCS = man/ali.man man/anno.man man/ap.man man/burst.man man/comp.man \
 	   man/mh-tailor.man man/mhbuild.man man/mhfixmsg.man man/mhl.man \
 	   man/mhlist.man man/mhmail.man man/mhn.man man/mhparam.man \
 	   man/mhpath.man man/mhshow.man man/mhstore.man man/mh-mkstemp.man \
-	   man/msgchk.man man/msh.man man/mts.conf.man man/new.man \
+	   man/msgchk.man man/mts.conf.man man/new.man \
 	   man/next.man man/nmh.man man/packf.man man/pick.man man/post.man \
 	   man/prev.man man/prompter.man man/rcvdist.man man/rcvpack.man \
 	   man/rcvstore.man man/rcvtty.man man/refile.man man/repl.man \
@@ -273,6 +274,9 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in \
 	     test/inc/fromline.txt test/inc/msgheader.txt test/inc/filler.txt \
 	     test/inc/md5sums test/mhmail/attachment.txt \
 	     test/mhbuild/tiny.jpg \
+	     test/mhbuild/somebinary \
+	     test/mhbuild/nulls \
+	     test/mhbuild/textplain \
 	     test/post/test-post-common.sh test/valgrind.supp uip/mhmail \
 	     SPECS/nmh.spec SPECS/build-nmh-cygwin $(man_SRCS)
 
@@ -359,10 +363,6 @@ uip_mhstore_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 uip_msgchk_SOURCES = uip/msgchk.c uip/popsbr.c
 uip_msgchk_LDADD = $(LDADD) $(SASLLIB) $(POSTLINK)
 
-uip_msh_SOURCES = uip/msh.c uip/mshcmds.c uip/vmhsbr.c uip/picksbr.c \
-		  uip/scansbr.c uip/dropsbr.c uip/mhlsbr.c
-uip_msh_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
-
 uip_new_SOURCES = uip/new.c
 uip_new_LDADD = $(LDADD) $(POSTLINK)