X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9f1e781a5c2beb9df943c832300a3f5bee1e4ed3..73e1f01148bb9709a405e27f7d3c5a95ea03b859:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 314288cf..7694abc4 100644
--- 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 \
@@ -191,7 +186,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 +195,7 @@ CLEANFILES = \
     etc/mhn.defaults \
     etc/mts.conf \
     man/man.sed \
-    man/mh-chart.man \
-    sbr/dtimep.c \
+    man/mh-chart.man
     #
 
 clean-local:
@@ -337,7 +330,6 @@ noinst_LIBRARIES = \
 noinst_HEADERS = \
     h/addrsbr.h \
     h/aliasbr.h \
-    h/crawl_folders.h \
     h/done.h \
     h/dropsbr.h \
     h/fmt_compile.h \
@@ -353,45 +345,130 @@ noinst_HEADERS = \
     h/netsec.h \
     h/nmh.h \
     h/oauth.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 \
     mts/smtp/smtp.h \
+    sbr/ambigsw.h \
     sbr/arglist.h \
+    sbr/atooi.h \
     sbr/base64.h \
+    sbr/brkstring.h \
+    sbr/check_charset.h \
+    sbr/client.h \
+    sbr/closefds.h \
+    sbr/concat.h \
+    sbr/context_del.h \
+    sbr/context_find.h \
+    sbr/context_foil.h \
+    sbr/context_read.h \
+    sbr/context_replace.h \
+    sbr/context_save.h \
+    sbr/copyip.h \
+    sbr/cpydata.h \
+    sbr/cpydgst.h \
+    sbr/crawl_folders.h \
+    sbr/credentials.h \
     sbr/ctype-checked.h \
+    sbr/datetime.h \
+    sbr/discard.h \
+    sbr/dtime.h \
+    sbr/encode_rfc2047.h \
     sbr/error.h \
+    sbr/escape_addresses.h \
+    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 \
+    sbr/folder_free.h \
+    sbr/folder_pack.h \
+    sbr/folder_read.h \
+    sbr/folder_realloc.h \
+    sbr/getarguments.h \
+    sbr/getcpy.h \
+    sbr/geteditor.h \
+    sbr/getfolder.h \
+    sbr/getpass.h \
     sbr/lock_file.h \
+    sbr/m_atoi.h \
+    sbr/m_backup.h \
+    sbr/m_convert.h \
+    sbr/m_draft.h \
+    sbr/m_getfld.h \
+    sbr/m_gmprot.h \
     sbr/m_maildir.h \
     sbr/m_mktemp.h \
+    sbr/m_name.h \
     sbr/m_popen.h \
     sbr/m_rand.h \
     sbr/makedir.h \
     sbr/message_id.h \
     sbr/mime_type.h \
+    sbr/path.h \
+    sbr/pidstatus.h \
+    sbr/print_help.h \
+    sbr/print_sw.h \
+    sbr/print_version.h \
+    sbr/push.h \
+    sbr/r1bindex.h \
     sbr/read_line.h \
+    sbr/read_switch.h \
+    sbr/read_switch_multiword.h \
+    sbr/read_switch_multiword_via_readline.h \
+    sbr/read_yes_or_no_if_tty.h \
+    sbr/readconfig.h \
+    sbr/refile.h \
+    sbr/remdir.h \
+    sbr/ruserpass.h \
     sbr/seq_add.h \
+    sbr/seq_bits.h \
     sbr/seq_del.h \
+    sbr/seq_getnum.h \
+    sbr/seq_list.h \
+    sbr/seq_nameok.h \
     sbr/seq_print.h \
+    sbr/seq_read.h \
+    sbr/seq_save.h \
+    sbr/seq_setcur.h \
+    sbr/seq_setprev.h \
+    sbr/seq_setunseen.h \
+    sbr/showfile.h \
+    sbr/smatch.h \
+    sbr/snprintb.h \
+    sbr/ssequal.h \
+    sbr/strindex.h \
     sbr/terminal.h \
+    sbr/trimcpy.h \
     sbr/unquote.h \
+    sbr/uprf.h \
+    sbr/vector.h \
+    sbr/vfgets.h \
     thirdparty/jsmn/jsmn.h \
+    uip/annosbr.h \
+    uip/distsbr.h \
     uip/forwsbr.h \
     uip/mhfree.h \
+    uip/mhlsbr.h \
     uip/mhmisc.h \
     uip/mhoutsbr.h \
     uip/mhshowsbr.h \
+    uip/picksbr.h \
+    uip/popsbr.h \
     uip/replsbr.h \
+    uip/scansbr.h \
+    uip/sendsbr.h \
+    uip/whatnowproc.h \
+    uip/whatnowsbr.h \
     #
 
 ##
 ## Extra files we need to install in various places
 ##
+dist_nmhetc_SCRIPTS = etc/rmmproc.messageid
 dist_nmhetc_DATA = \
     etc/MailAliases \
     etc/components \
@@ -412,7 +489,6 @@ dist_nmhetc_DATA = \
     etc/rcvdistcomps.outbox \
     etc/replcomps \
     etc/replgroupcomps \
-    etc/rmmproc.messageid \
     etc/scan.MMDDYY \
     etc/scan.YYYYMMDD \
     etc/scan.curses \
@@ -468,7 +544,6 @@ docs_contribdir = $(docdir)/contrib
 dist_docs_contrib_SCRIPTS = \
     docs/contrib/localpostproc \
     docs/contrib/ml \
-    docs/contrib/replaliases \
     docs/contrib/replyfilter \
     docs/contrib/vpick \
     #
@@ -1083,7 +1158,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)"' \