lib/thread: rewrite _parent_or_toplevel to use depths

[notmuch] / lib / Makefile.local

diff --git a/lib/Makefile.local b/lib/Makefile.local
index 0b5c4b0805f570ec27b62c4ada80c7a25ea5719e..5dc057c090133b5c4be9647635a623188eeff6d2 100644 (file)
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -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
@@ -43,6 +43,7 @@ libnotmuch_c_srcs =           \
        $(dir)/sha1.c           \
        $(dir)/built-with.c     \
        $(dir)/string-map.c     \
+       $(dir)/indexopts.c      \
        $(dir)/tags.c
 
 libnotmuch_cxx_srcs =          \
@@ -57,7 +58,8 @@ libnotmuch_cxx_srcs =         \
        $(dir)/query-fp.cc      \
        $(dir)/config.cc        \
        $(dir)/regexp-fields.cc \
-       $(dir)/thread.cc
+       $(dir)/thread.cc \
+       $(dir)/thread-fp.cc
 
 libnotmuch_modules := $(libnotmuch_c_srcs:.c=.o) $(libnotmuch_cxx_srcs:.cc=.o)