libnotmuch: build symbols list without relying on gcc -aux-info.

[notmuch] / lib / Makefile.local

diff --git a/lib/Makefile.local b/lib/Makefile.local
index a60ef989f49c21ca49618c56e35baef7a30c11a8..7e2bc87be147734d0750ee345ac51556e9320575 100644 (file)
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -14,8 +14,10 @@
 LIBNOTMUCH_VERSION_MAJOR = 1
 
 # The minor version of the library interface. This should be incremented at
-# the time of release for any additions to the library interface.
-LIBNOTMUCH_VERSION_MINOR = 1
+# the time of release for any additions to the library interface,
+# (and when it is incremented, the release version of the library should
+#  be reset to 0).
+LIBNOTMUCH_VERSION_MINOR = 3
 
 # The release version the library interface. This should be incremented at
 # the time of release if there have been no changes to the interface, (but
@@ -34,17 +36,21 @@ 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,-soname=$(SONAME)
+LIBRARY_LINK_FLAG = -shared -Wl,--version-script=notmuch.sym,-soname=$(SONAME)
 ifeq ($(LIBDIR_IN_LDCONFIG),1)
+ifeq ($(DESTDIR),)
 LIBRARY_INSTALL_POST_COMMAND=ldconfig
 endif
 endif
+endif
 
 dir := lib
-extra_cflags += -I$(dir) -fPIC
+extra_cflags += -I$(srcdir)/$(dir) -fPIC
 
 libnotmuch_c_srcs =            \
        $(notmuch_compat_srcs)  \
+       $(dir)/filenames.c      \
+       $(dir)/string-list.c    \
        $(dir)/libsha1.c        \
        $(dir)/message-file.c   \
        $(dir)/messages.c       \
@@ -60,13 +66,19 @@ libnotmuch_cxx_srcs =               \
        $(dir)/query.cc         \
        $(dir)/thread.cc
 
-libnotmuch_modules = $(libnotmuch_c_srcs:.c=.o) $(libnotmuch_cxx_srcs:.cc=.o)
+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)
-       $(call quiet,CXX $(CXXFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@
+$(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym
+       echo $(libnotmuch_modules)
+       $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@
+
+notmuch.sym: lib/notmuch.h
+       printf "{\nglobal:\n" > notmuch.sym
+       sed  -n 's/^\s*\(notmuch_[a-z_]*\)\s*(.*/\t\1;/p' $< >> notmuch.sym
+       printf "local: *;\n};\n" >> notmuch.sym
 
 $(dir)/$(SONAME): $(dir)/$(LIBNAME)
        ln -sf $(LIBNAME) $@
@@ -80,14 +92,14 @@ install: install-$(dir)
 # but cannot be used reliably within commands, so copy its value to a
 # variable that is not reused.
 lib := $(dir)
-install-$(dir):
-       mkdir -p $(DESTDIR)$(libdir)/
-       install -m0644 $(lib)/$(LIBNAME) $(DESTDIR)$(libdir)/
-       ln -sf $(LIBNAME) $(DESTDIR)$(libdir)/$(SONAME)
-       ln -sf $(LIBNAME) $(DESTDIR)$(libdir)/$(LINKER_NAME)
-       mkdir -p $(DESTDIR)$(includedir)
-       install -m0644 $(lib)/notmuch.h $(DESTDIR)$(includedir)/
+install-$(dir): $(dir)/$(LIBNAME)
+       mkdir -p "$(DESTDIR)$(libdir)/"
+       install -m0644 "$(lib)/$(LIBNAME)" "$(DESTDIR)$(libdir)/"
+       ln -sf $(LIBNAME) "$(DESTDIR)$(libdir)/$(SONAME)"
+       ln -sf $(LIBNAME) "$(DESTDIR)$(libdir)/$(LINKER_NAME)"
+       mkdir -p "$(DESTDIR)$(includedir)"
+       install -m0644 "$(srcdir)/$(lib)/notmuch.h" "$(DESTDIR)$(includedir)/"
        $(LIBRARY_INSTALL_POST_COMMAND)
 
 SRCS  := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs)
-CLEAN := $(CLEAN) $(libnotmuch_modules) $(dir)/$(SONAME) $(dir)/$(LINKER_NAME) $(dir)$(LIBNAME) libnotmuch.a
+CLEAN := $(CLEAN) $(libnotmuch_modules) $(dir)/$(SONAME) $(dir)/$(LINKER_NAME) $(dir)$(LIBNAME) libnotmuch.a notmuch.sym