Merge branch 'release'

[notmuch] / lib / Makefile.local

diff --git a/lib/Makefile.local b/lib/Makefile.local
index beb963582fe5053fff730fd7a225af4d47bc03dd..d36fd5a0678e7cf11cebe13d565feb4520e71d16 100644 (file)
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -35,11 +35,11 @@ libnotmuch_c_srcs =         \
        $(notmuch_compat_srcs)  \
        $(dir)/filenames.c      \
        $(dir)/string-list.c    \
-       $(dir)/libsha1.c        \
        $(dir)/message-file.c   \
        $(dir)/messages.c       \
        $(dir)/sha1.c           \
        $(dir)/built-with.c     \
+       $(dir)/string-map.c     \
        $(dir)/tags.c
 
 libnotmuch_cxx_srcs =          \
@@ -48,9 +48,11 @@ libnotmuch_cxx_srcs =                \
        $(dir)/directory.cc     \
        $(dir)/index.cc         \
        $(dir)/message.cc       \
+       $(dir)/message-property.cc \
        $(dir)/query.cc         \
        $(dir)/query-fp.cc      \
        $(dir)/config.cc        \
+       $(dir)/regexp-fields.cc \
        $(dir)/thread.cc
 
 libnotmuch_modules := $(libnotmuch_c_srcs:.c=.o) $(libnotmuch_cxx_srcs:.cc=.o)
@@ -58,8 +60,8 @@ libnotmuch_modules := $(libnotmuch_c_srcs:.c=.o) $(libnotmuch_cxx_srcs:.cc=.o)
 $(dir)/libnotmuch.a: $(libnotmuch_modules)
        $(call quiet,AR) rcs $@ $^
 
-$(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym util/libutil.a parse-time-string/libparse-time-string.a
-       $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libutil.a parse-time-string/libparse-time-string.a
+$(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym util/libnotmuch_util.a parse-time-string/libparse-time-string.a
+       $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libnotmuch_util.a parse-time-string/libparse-time-string.a
 
 notmuch.sym: $(srcdir)/$(dir)/notmuch.h $(libnotmuch_modules)
        sh $(srcdir)/$(lib)/gen-version-script.sh $< $(libnotmuch_modules) > $@