create libnotmuch

diff --git a/Makefile.autosetup b/Makefile.autosetup
index a6dc534784fb5c6d5986cbfe07c163a85297c95d..8dce07a1f0ca8bbc2c0de67c0923c1689df66c5f 100644 (file)
--- a/Makefile.autosetup
+++ b/Makefile.autosetup
@@ -77,9 +77,6 @@ NEOMUTTOBJS=  addrbook.o alias.o bcache.o browser.o buffy.o \
 @if !HAVE_WCSCASECMP
 NEOMUTTOBJS+=  wcscasecmp.o
 @endif
-@if USE_NOTMUCH
-NEOMUTTOBJS+=  mutt_notmuch.o
-@endif
 @if MIXMASTER
 NEOMUTTOBJS+=  remailer.o
 @endif
@@ -122,6 +119,16 @@ CLEANFILES+=       $(LIBMBOX) $(LIBMBOXOBJS)
 MUTTLIBS+=     $(LIBMBOX)
 ALLOBJS+=      $(LIBMBOXOBJS)
 
+###############################################################################
+# libnotmuch
+@if USE_NOTMUCH
+LIBNOTMUCH=    libnotmuch.a
+LIBNOTMUCHOBJS=        notmuch/mutt_notmuch.o
+CLEANFILES+=   $(LIBNOTMUCH) $(LIBNOTMUCHOBJS)
+MUTTLIBS+=     $(LIBNOTMUCH)
+ALLOBJS+=      $(LIBNOTMUCHOBJS)
+@endif
+
 ###############################################################################
 # libmutt
 LIBMUTT=       libmutt.a
@@ -280,6 +287,13 @@ $(LIBMBOX): $(PWD)/mbox $(LIBMBOXOBJS)
 $(PWD)/mbox:
        $(MKDIR_P) $(PWD)/mbox
 
+# libnotmuch
+$(LIBNOTMUCH): $(PWD)/notmuch $(LIBNOTMUCHOBJS)
+       $(AR) cr $@ $(LIBNOTMUCHOBJS)
+       $(RANLIB) $@
+$(PWD)/notmuch:
+       $(MKDIR_P) $(PWD)/notmuch
+
 # libncrypt
 $(LIBNCRYPT): $(PWD)/ncrypt $(LIBNCRYPTOBJS)
        $(AR) cr $@ $(LIBNCRYPTOBJS)

diff --git a/browser.c b/browser.c
index 49bf8cc4e336aa44407666f5d9d3f1f87447f3c6..e22e2743ed3aaa80db7866f66ec3f4f45beb60cf 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -62,7 +62,7 @@
 #include "nntp/nntp.h"
 #endif
 #ifdef USE_NOTMUCH
-#include "mutt_notmuch.h"
+#include "notmuch/mutt_notmuch.h"
 #endif
 
 static const struct Mapping FolderHelp[] = {

diff --git a/buffy.c b/buffy.c
index 550555a89d50152cc35bf71ce9244c41e66d4303..c04e0504d574232b7662ca15d29215a7aff57650 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -47,7 +47,7 @@
 #include "imap/imap.h"
 #endif
 #ifdef USE_NOTMUCH
-#include "mutt_notmuch.h"
+#include "notmuch/mutt_notmuch.h"
 #endif
 
 static time_t BuffyTime = 0; /**< last time we started checking for mail */

diff --git a/commands.c b/commands.c
index e19db60b590525f7dbd9057ab7d155fb6eb1d7a5..9a7377f0d2c21471e93d91e680dffae1bbb4a525 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -55,7 +55,7 @@
 #include "imap/imap.h"
 #endif
 #ifdef USE_NOTMUCH
-#include "mutt_notmuch.h"
+#include "notmuch/mutt_notmuch.h"
 #endif
 #ifdef ENABLE_NLS
 #include <libintl.h>

diff --git a/copy.c b/copy.c
index b58d39cbe7f9f1818025f0ca7df8d6f37ef34958..c786a953bc21708b466934b5f24ca09f47786c27 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -47,7 +47,7 @@
 #include "rfc2047.h"
 #include "state.h"
 #ifdef USE_NOTMUCH
-#include "mutt_notmuch.h"
+#include "notmuch/mutt_notmuch.h"
 #endif
 
 static int address_header_decode(char **h);

diff --git a/curs_lib.c b/curs_lib.c
index 704afe6d05911c45bfde14044ecdf76f5a44895a..5fc5ea4dbdcea3606164416312b291123f140e70 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -53,7 +53,7 @@
 #include <wctype.h>
 #endif
 #ifdef USE_NOTMUCH
-#include "mutt_notmuch.h"
+#include "notmuch/mutt_notmuch.h"
 #endif
 
 /* not possible to unget more than one char under some curses libs, and it

diff --git a/curs_main.c b/curs_main.c
index 4f75221402a7560f91d00fd2cb31e20c73df2419..f1f60fa47e468bb01ac65d1a1fb190ef70a9765d 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -64,7 +64,7 @@
 #include "imap/imap.h"
 #endif
 #ifdef USE_NOTMUCH
-#include "mutt_notmuch.h"
+#include "notmuch/mutt_notmuch.h"
 #endif
 #ifdef USE_NNTP
 #include "nntp/nntp.h"

diff --git a/init.c b/init.c
index cec49f7d54f98d9c002b67a4b5f9a30936f96b4a..d2c3534456981a10e4163f878198f5408344049c 100644 (file)
--- a/init.c
+++ b/init.c
@@ -58,7 +58,7 @@
 #include "sidebar.h"
 #include "version.h"
 #ifdef USE_NOTMUCH
-#include "mutt_notmuch.h"
+#include "notmuch/mutt_notmuch.h"
 #endif
 #ifdef USE_IMAP
 #include "imap/imap.h" /* for imap_subscribe() */

diff --git a/mh.c b/mh.c
index b4400e2e31c86bc473aeccd6ea036db2a5a8149d..5c05eb7a50c13ab7e52b9ce15e4c59c2ff8fdc42 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -53,7 +53,7 @@
 #include "protos.h"
 #include "sort.h"
 #ifdef USE_NOTMUCH
-#include "mutt_notmuch.h"
+#include "notmuch/mutt_notmuch.h"
 #endif
 #ifdef USE_HCACHE
 #include "hcache/hcache.h"

diff --git a/mx.c b/mx.c
index 8b00155897efabca68b2b14f9de8838e34054f0a..f6900daca08c9623cb667fd710306b17aa208b61 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -73,7 +73,7 @@
 #include "nntp/nntp.h"
 #endif
 #ifdef USE_NOTMUCH
-#include "mutt_notmuch.h"
+#include "notmuch/mutt_notmuch.h"
 #endif
 #ifdef ENABLE_NLS
 #include <libintl.h>

diff --git a/mutt_notmuch.c b/notmuch/mutt_notmuch.c
similarity index 100%
rename from mutt_notmuch.c
rename to notmuch/mutt_notmuch.c

diff --git a/mutt_notmuch.h b/notmuch/mutt_notmuch.h
similarity index 100%
rename from mutt_notmuch.h
rename to notmuch/mutt_notmuch.h

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 435e256727e5528dd0bfe3a028f3ff60d9ff7acc..f85b721ca2200431d26abc106b11ed019cae5542 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -95,7 +95,6 @@ mutt_body.c
 mutt_header.c
 mutt_logging.c
 mutt_lua.c
-mutt_notmuch.c
 mutt_signal.c
 mutt_socket.c
 mutt_thread.c
@@ -119,6 +118,7 @@ ncrypt/pgppacket.c
 ncrypt/smime.c
 nntp/newsrc.c
 nntp/nntp.c
+notmuch/mutt_notmuch.c
 opcodes.h
 pager.c
 parse.c

diff --git a/send.c b/send.c
index 4d434f279a7bf1bde93851228867d63b6c1b231b..76756006f363088d538b4885265ef9a1be14f47c 100644 (file)
--- a/send.c
+++ b/send.c
@@ -56,7 +56,7 @@
 #include "remailer.h"
 #endif
 #ifdef USE_NOTMUCH
-#include "mutt_notmuch.h"
+#include "notmuch/mutt_notmuch.h"
 #endif
 
 static void append_signature(FILE *f)

diff --git a/sidebar.c b/sidebar.c
index 9ff44f9516ac69aa94fc95670d516db257673943..829a2b5ae31452a343cea92cc05ac0e21b3794a8 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -50,7 +50,7 @@
 #include "protos.h"
 #include "sort.h"
 #ifdef USE_NOTMUCH
-#include "mutt_notmuch.h"
+#include "notmuch/mutt_notmuch.h"
 #endif
 
 /* Previous values for some sidebar config */

diff --git a/status.c b/status.c
index 6fb2f8a1e9296493f4784f7840f99cef890b849a..1f48b71a0fd86a6e1897f519245d7c6a11968e3e 100644 (file)
--- a/status.c
+++ b/status.c
@@ -40,7 +40,7 @@
 #include "protos.h"
 #include "sort.h"
 #ifdef USE_NOTMUCH
-#include "mutt_notmuch.h"
+#include "notmuch/mutt_notmuch.h"
 #endif
 
 /**