X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/4974d09cc659e2859fcf916ad020628c9695e2f8..910e279ce7871bd35b90e558de7a0d0b17471b49:/Makefile.am?ds=sidebyside

diff --git a/Makefile.am b/Makefile.am
index ae7b98c3..bd4ee9c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -166,9 +166,7 @@ TESTS = \
     test/whom/test-whom \
     test/cleanup ## The "cleanup" test should always be last.
 
-XFAIL_TESTS = \
-    test/inc/test-eom-align \
-    #
+XFAIL_TESTS =
 
 check_SCRIPTS = test/common.sh
 
@@ -295,6 +293,10 @@ bin_PROGRAMS = \
     uip/whom \
     #
 
+noinst_PROGRAMS = \
+    uip/imaptest \
+    #
+
 bin_SCRIPTS = \
     etc/sendfiles \
     uip/mhmail \
@@ -337,6 +339,7 @@ noinst_HEADERS = \
     h/addrsbr.h \
     h/aliasbr.h \
     h/crawl_folders.h \
+    h/done.h \
     h/dropsbr.h \
     h/fmt_compile.h \
     h/fmt_scan.h \
@@ -360,6 +363,7 @@ noinst_HEADERS = \
     h/tws.h \
     h/utils.h \
     mts/smtp/smtp.h \
+    sbr/base64.h \
     sbr/ctype-checked.h \
     sbr/lock_file.h \
     sbr/m_maildir.h \
@@ -369,9 +373,12 @@ noinst_HEADERS = \
     sbr/makedir.h \
     sbr/message_id.h \
     sbr/mime_type.h \
+    sbr/read_line.h \
+    sbr/terminal.h \
     sbr/unquote.h \
     thirdparty/jsmn/jsmn.h \
     uip/mhfree.h \
+    uip/mhmisc.h \
     uip/mhoutsbr.h \
     uip/mhshowsbr.h \
     #
@@ -693,6 +700,9 @@ uip_forw_SOURCES = uip/forw.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
 		   uip/annosbr.c uip/distsbr.c uip/forwsbr.c
 uip_forw_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
+uip_imaptest_SOURCES = uip/imaptest.c
+uip_imaptest_LDADD = $(LDADD) $(SASLLIB) $(CURLLIB) $(TLSLIB) $(POSTLINK)
+
 uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/popsbr.c
 uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB) $(CURLLIB) \
 		$(TLSLIB) $(POSTLINK)
@@ -873,7 +883,6 @@ config/version.c: Makefile $(srcdir)/config/version.sh
 	env srcdir="$(srcdir)" sh $(srcdir)/config/version.sh $(VERSION) > ./config/version.c
 
 etc/bash_completion_nmh: $(srcdir)/etc/bash_completion_nmh-gen
-	$(MKDIR_P) $(@D) # FIXME: A better way?
 	$(srcdir)/etc/bash_completion_nmh-gen > $@
 
 etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
@@ -886,7 +895,6 @@ etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
 				< $(srcdir)/etc/mts.conf.in > $@
 
 etc/mhn.defaults: $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPROG)
-	$(MKDIR_P) $(@D) # FIXME: A better way?
 	@rm -f $@
 	$(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@
 
@@ -1148,7 +1156,7 @@ ChangeLog:
 ## Our RPM build target
 ##
 rpm: dist
-	@test -d $(rpmdir)/SOURCES || $(MKDIR_P) $(rpmdir)/SOURCES
+	@$(MKDIR_P) $(rpmdir)/SOURCES
 	@mv -f $(DIST_ARCHIVES) $(rpmdir)/SOURCES
 	@cp -p VERSION $(rpmdir)/SOURCES
 	@rpmbuild --define '_topdir $(rpmdir)' \