X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d9b33232b6e3b03d7ff0b67e28e82ee455e00d99..ba7b003a620923555458964d6c7fd05ebaadc836:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9f6b675c..e553295d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -162,10 +162,6 @@ TESTS = \
     test/whom/test-whom \
     test/cleanup ## The "cleanup" test should always be last.
 
-XFAIL_TESTS = \
-    test/scan/test-scan \
-    #
-
 check_SCRIPTS = test/common.sh
 
 check_PROGRAMS = \
@@ -339,10 +335,8 @@ noinst_HEADERS = \
     h/fmt_compile.h \
     h/fmt_scan.h \
     h/icalendar.h \
-    h/md5.h \
     h/mf.h \
     h/mh.h \
-    h/mhcachesbr.h \
     h/mhparse.h \
     h/mime.h \
     h/mts.h \
@@ -361,7 +355,6 @@ noinst_HEADERS = \
     sbr/brkstring.h \
     sbr/check_charset.h \
     sbr/client.h \
-    sbr/closefds.h \
     sbr/concat.h \
     sbr/context_del.h \
     sbr/context_find.h \
@@ -763,8 +756,11 @@ uip_ali_LDADD = $(LDADD) $(POSTLINK)
 uip_anno_SOURCES = uip/anno.c uip/annosbr.c
 uip_anno_LDADD = $(LDADD) $(POSTLINK)
 
-uip_burst_SOURCES = uip/burst.c uip/mhparse.c uip/mhmisc.c uip/mhfree.c \
-		    uip/mhcachesbr.c
+uip_burst_SOURCES = uip/burst.c \
+		    uip/mhparse.c \
+		    uip/mhmisc.c \
+		    uip/mhfree.c \
+		    #
 uip_burst_LDADD = $(LDADD) $(ICONVLIB) $(POSTLINK)
 
 uip_comp_SOURCES = uip/comp.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
@@ -798,26 +794,47 @@ uip_install_mh_LDADD = $(LDADD) $(POSTLINK)
 uip_mark_SOURCES = uip/mark.c
 uip_mark_LDADD = $(LDADD) $(POSTLINK)
 
-uip_mhbuild_SOURCES = uip/mhbuild.c uip/mhbuildsbr.c uip/mhcachesbr.c \
-		      uip/mhlistsbr.c uip/mhoutsbr.c uip/mhmisc.c  \
-		      uip/mhfree.c uip/mhparse.c \
-		      uip/mhstoresbr.c uip/mhshowsbr.c
+uip_mhbuild_SOURCES = uip/mhbuild.c \
+		      uip/mhbuildsbr.c \
+		      uip/mhlistsbr.c \
+		      uip/mhoutsbr.c \
+		      uip/mhmisc.c \
+		      uip/mhfree.c \
+		      uip/mhparse.c \
+		      uip/mhstoresbr.c \
+		      uip/mhshowsbr.c \
+		      #
 uip_mhbuild_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
-uip_mhfixmsg_SOURCES = uip/mhfixmsg.c uip/mhparse.c uip/mhcachesbr.c \
-		       uip/mhoutsbr.c uip/mhmisc.c uip/mhfree.c \
-		       uip/mhshowsbr.c uip/mhlistsbr.c
+uip_mhfixmsg_SOURCES = uip/mhfixmsg.c \
+		       uip/mhparse.c \
+		       uip/mhoutsbr.c \
+		       uip/mhmisc.c \
+		       uip/mhfree.c \
+		       uip/mhshowsbr.c \
+		       uip/mhlistsbr.c \
+		       #
 uip_mhfixmsg_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_mhical_SOURCES = uip/mhical.c
 uip_mhical_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
-uip_mhlist_SOURCES = uip/mhlist.c uip/mhparse.c uip/mhcachesbr.c \
-		     uip/mhlistsbr.c uip/mhmisc.c uip/mhfree.c
+uip_mhlist_SOURCES = uip/mhlist.c \
+		     uip/mhparse.c \
+		     uip/mhlistsbr.c \
+		     uip/mhmisc.c \
+		     uip/mhfree.c \
+		     #
 uip_mhlist_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
-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_mhn_SOURCES = uip/mhn.c \
+		  uip/mhparse.c \
+		  uip/mhshowsbr.c \
+		  uip/mhlistsbr.c \
+		  uip/mhstoresbr.c \
+		  uip/mhmisc.c \
+		  uip/mhfree.c \
+		  #
 uip_mhn_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_mhparam_SOURCES = uip/mhparam.c
@@ -826,14 +843,23 @@ uip_mhparam_LDADD = $(LDADD) $(POSTLINK)
 uip_mhpath_SOURCES = uip/mhpath.c
 uip_mhpath_LDADD = $(LDADD) $(POSTLINK)
 
-uip_mhshow_SOURCES = uip/mhshow.c uip/mhparse.c uip/mhcachesbr.c \
-		     uip/mhshowsbr.c uip/mhlistsbr.c uip/mhmisc.c \
-		     uip/mhfree.c
+uip_mhshow_SOURCES = uip/mhshow.c \
+		     uip/mhparse.c \
+		     uip/mhshowsbr.c \
+		     uip/mhlistsbr.c \
+		     uip/mhmisc.c \
+		     uip/mhfree.c \
+		     #
 uip_mhshow_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
-uip_mhstore_SOURCES = uip/mhstore.c uip/mhparse.c uip/mhcachesbr.c \
-		      uip/mhshowsbr.c uip/mhlistsbr.c uip/mhstoresbr.c \
-		      uip/mhmisc.c uip/mhfree.c
+uip_mhstore_SOURCES = uip/mhstore.c \
+		      uip/mhparse.c \
+		      uip/mhshowsbr.c \
+		      uip/mhlistsbr.c \
+		      uip/mhstoresbr.c \
+		      uip/mhmisc.c \
+		      uip/mhfree.c \
+		      #
 uip_mhstore_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_msgchk_SOURCES = uip/msgchk.c uip/popsbr.c
@@ -1040,7 +1066,6 @@ sbr_libmh_a_SOURCES = \
     sbr/charstring.c \
     sbr/check_charset.c \
     sbr/client.c \
-    sbr/closefds.c \
     sbr/concat.c \
     sbr/context_del.c \
     sbr/context_find.c \
@@ -1095,7 +1120,6 @@ sbr_libmh_a_SOURCES = \
     sbr/m_popen.c \
     sbr/m_rand.c \
     sbr/makedir.c \
-    sbr/md5.c \
     sbr/message_id.c \
     sbr/mf.c \
     sbr/mime_type.c \