]> diplodocus.org Git - nmh/blobdiff - Makefile.am
projects / nmh / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Reorder configure options to be before variables
[nmh] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 865b70a635761f2c9f70ed3efcaecfbb9c590d4a..ffc4d65b027796a231db4c5aa9d8741e04e8b17e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,12 +26,6 @@ LDADD = sbr/libmh.a
 MHNSEARCHPATH = "$(PATH)"
 MHNSEARCHPROG = $(srcdir)/etc/mhn.find.sh
 
-##
-## Install config files and back-end programs in our own subdirecctories.
-##
-nmhetcdir  = @sysconfdir@/nmh
-nmhlibexecdir = @libexecdir@/nmh
-
 ##
 ## nmh _does_ have a test suite!
 ##
@@ -71,6 +65,7 @@ TESTS = \
     test/format/test-curses \
     test/format/test-dp \
     test/format/test-fmtdump \
+    test/format/test-fmttest \
     test/format/test-functions \
     test/format/test-localmbox \
     test/format/test-myhost \
@@ -101,6 +96,7 @@ TESTS = \
     test/mhbuild/test-utf8-body \
     test/mhfixmsg/test-mhfixmsg \
     test/mhical/test-mhical \
+    test/mhl/test-format \
     test/mhl/test-mhl-flags \
     test/mhl/test-rfc6532 \
     test/mhlist/test-ext-params \
@@ -111,6 +107,8 @@ TESTS = \
     test/mhshow/test-binary \
     test/mhshow/test-charset \
     test/mhshow/test-cte-binary \
+    test/mhshow/test-exec \
+    test/mhshow/test-markers \
     test/mhshow/test-msg-buffer-boundaries \
     test/mhshow/test-qp \
     test/mhshow/test-subpart \
@@ -165,8 +163,6 @@ TESTS = \
     test/whom/test-whom \
     test/cleanup ## The "cleanup" test should always be last.
 
-XFAIL_TESTS =
-
 check_SCRIPTS = test/common.sh
 
 check_PROGRAMS = \
@@ -191,7 +187,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1 \
 
 ##
 ## Stuff that should be cleaned via "make clean"
-## automake 1.12.6 on FreeBSD 9 needs the sbr/dtimep.c.
 ##
 CLEANFILES = \
     $(man_MANS) \
@@ -201,8 +196,7 @@ CLEANFILES = \
     etc/mhn.defaults \
     etc/mts.conf \
     man/man.sed \
-    man/mh-chart.man \
-    sbr/dtimep.c \
+    man/mh-chart.man
     #
 
 clean-local:
@@ -342,10 +336,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 \
@@ -364,7 +356,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 \
@@ -387,6 +378,7 @@ noinst_HEADERS = \
     sbr/ext_hook.h \
     sbr/fdcompare.h \
     sbr/fmt_addr.h \
+    sbr/fmt_new.h \
     sbr/fmt_rfc2047.h \
     sbr/folder_addmsg.h \
     sbr/folder_delmsgs.h \
@@ -474,6 +466,7 @@ noinst_HEADERS = \
 ##
 ## Extra files we need to install in various places
 ##
+dist_nmhetc_SCRIPTS = etc/rmmproc.messageid
 dist_nmhetc_DATA = \
     etc/MailAliases \
     etc/components \
@@ -494,7 +487,6 @@ dist_nmhetc_DATA = \
     etc/rcvdistcomps.outbox \
     etc/replcomps \
     etc/replgroupcomps \
-    etc/rmmproc.messageid \
     etc/scan.MMDDYY \
     etc/scan.YYYYMMDD \
     etc/scan.curses \
@@ -550,7 +542,6 @@ docs_contribdir = $(docdir)/contrib
 dist_docs_contrib_SCRIPTS = \
     docs/contrib/localpostproc \
     docs/contrib/ml \
-    docs/contrib/replaliases \
     docs/contrib/replyfilter \
     docs/contrib/vpick \
     #
@@ -766,8 +757,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 \
@@ -801,26 +795,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
@@ -829,14 +844,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
@@ -1043,7 +1067,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 \
@@ -1098,7 +1121,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 \
@@ -1165,7 +1187,7 @@ sbr/icalendar.c: sbr/icalparse.c
 
 config/sbr_libmh_a-config.$(OBJEXT) sbr/sbr_libmh_a-mts.$(OBJEXT): Makefile
 
-sbr_libmh_a_CPPFLAGS = ${AM_CPPFLAGS} -I./sbr \
+sbr_libmh_a_CPPFLAGS = ${AM_CPPFLAGS} \
                -DNMHBINDIR='"$(bindir)"' \
                -DNMHLIBEXECDIR='"$(nmhlibexecdir)"' \
                -DNMHETCDIR='"@nmhetcdirinst@$(nmhetcdir)"' \
Fork of https://git.savannah.nongnu.org/cgit/nmh.git