lib/open: pull _load_key_file out of _choose_database_path

[notmuch] / lib / Makefile.local

diff --git a/lib/Makefile.local b/lib/Makefile.local
index 93b08d1500675f62ac0ba74099339d1ab777a2f7..01cbb3f2821c8e0a1e0145192e2e3368b625d6c7 100644 (file)
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -1,4 +1,4 @@
-# -*- makefile -*-
+# -*- makefile-gmake -*-
 
 dir := lib
 
@@ -19,7 +19,7 @@ LIBRARY_SUFFIX = so
 LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)
 SONAME = $(LINKER_NAME).$(LIBNOTMUCH_VERSION_MAJOR)
 LIBNAME = $(SONAME).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE)
-LIBRARY_LINK_FLAG = -shared -Wl,--version-script=$(lib)/notmuch.sym,-soname=$(SONAME) $(NO_UNDEFINED_LDFLAGS)
+LIBRARY_LINK_FLAG = -shared -Wl,--version-script=$(srcdir)/$(lib)/notmuch.sym,-soname=$(SONAME) $(NO_UNDEFINED_LDFLAGS)
 ifeq ($(PLATFORM),OPENBSD)
 LIBRARY_LINK_FLAG += -lc
 endif
@@ -58,7 +58,11 @@ libnotmuch_cxx_srcs =                \
        $(dir)/query-fp.cc      \
        $(dir)/config.cc        \
        $(dir)/regexp-fields.cc \
-       $(dir)/thread.cc
+       $(dir)/thread.cc \
+       $(dir)/thread-fp.cc     \
+       $(dir)/features.cc      \
+       $(dir)/prefix.cc        \
+       $(dir)/open.cc
 
 libnotmuch_modules := $(libnotmuch_c_srcs:.c=.o) $(libnotmuch_cxx_srcs:.cc=.o)