X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d43c995de90c5022b8a2be60e8595b0a968f6089..d9c88cd101a63778a85dfd55a01a3af0db2465c9:/Makefile.am?ds=sidebyside

diff --git a/Makefile.am b/Makefile.am
index fb982b14..9ab7f57e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -337,7 +337,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,11 +352,7 @@ 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 \
@@ -380,14 +375,19 @@ noinst_HEADERS = \
     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 \
@@ -395,6 +395,7 @@ noinst_HEADERS = \
     sbr/folder_pack.h \
     sbr/folder_read.h \
     sbr/folder_realloc.h \
+    sbr/getarguments.h \
     sbr/getcpy.h \
     sbr/geteditor.h \
     sbr/getfolder.h \
@@ -404,8 +405,11 @@ noinst_HEADERS = \
     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 \
@@ -420,6 +424,9 @@ noinst_HEADERS = \
     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 \
@@ -448,17 +455,27 @@ noinst_HEADERS = \
     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 \
@@ -479,7 +496,6 @@ dist_nmhetc_DATA = \
     etc/rcvdistcomps.outbox \
     etc/replcomps \
     etc/replgroupcomps \
-    etc/rmmproc.messageid \
     etc/scan.MMDDYY \
     etc/scan.YYYYMMDD \
     etc/scan.curses \
@@ -535,7 +551,6 @@ docs_contribdir = $(docdir)/contrib
 dist_docs_contrib_SCRIPTS = \
     docs/contrib/localpostproc \
     docs/contrib/ml \
-    docs/contrib/replaliases \
     docs/contrib/replyfilter \
     docs/contrib/vpick \
     #
@@ -1150,7 +1165,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)"' \