Merge branch 'debian' into rebuild

[notmuch] / lib / Makefile.local

diff --git a/lib/Makefile.local b/lib/Makefile.local
index 85b010e6f12de1848e22f63dfb6eb541a88aaddf..03a458b250d05c84f6cef18e66320a3722148466 100644 (file)
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -1,7 +1,16 @@
+# -*- makefile -*-
+
 # The major version of the library interface. This will control the soname.
 # As such, this number must be incremented for any incompatible change to
 # the library interface, (such as the deletion of an API or a major
 # semantic change that breaks formerly functioning code).
+#
+# Note: We don't currently have plans to increment this at this time.
+# If we *do* want to make an incompatible change to the library
+# interface, we'll have to decide whether to increment this (creating
+# a new soname) or to introduce symbol versioning to be able to
+# provide support for both old and new interfaces without having to
+# increment this.
 LIBNOTMUCH_VERSION_MAJOR = 1
 
 # The minor version of the library interface. This should be incremented at
@@ -38,24 +47,27 @@ libnotmuch_cxx_srcs =               \
 
 libnotmuch_modules = $(libnotmuch_c_srcs:.c=.o) $(libnotmuch_cxx_srcs:.cc=.o)
 
-$(dir)/$(LIBNAME) : $(libnotmuch_modules)
-       $(call quiet,CXX,$(LDFLAGS)) $^ $(FINAL_LDFLAGS) -shared -Wl,-soname=$(SONAME) -o $@
+$(dir)/libnotmuch.a: $(libnotmuch_modules)
+       $(call quiet,AR) rcs $@ $^
+
+$(dir)/$(LIBNAME): $(libnotmuch_modules)
+       $(call quiet,CXX $(CXXFLAGS)) $^ $(FINAL_LDFLAGS) -shared -Wl,-soname=$(SONAME) -o $@
 
 $(dir)/$(SONAME): $(dir)/$(LIBNAME)
-       $(call quiet_symlink, $(LIBNAME) $@)
+       ln -sf $(LIBNAME) $@
 
 $(dir)/$(LINKER_NAME): $(dir)/$(SONAME)
-       $(call quiet_symlink, $(LIBNAME) $@)
+       ln -sf $(LIBNAME) $@
 
 install: install-$(dir)
 
 install-$(dir):
-       $(call quiet_mkdir, $(DESTDIR)$(libdir)/)
-       $(call quiet_install_data, $(dir)/$(LIBNAME) $(DESTDIR)$(libdir)/)
-       $(call quiet_symlink, $(LIBNAME) $(DESTDIR)$(libdir)/$(SONAME))
-       $(call quiet_symlink, $(LIBNAME) $(DESTDIR)$(libdir)/$(LINKER_NAME))
-       $(call quiet_mkdir, $(DESTDIR)$(prefix)/include/)
-       $(call quiet_install_data, $(dir)/notmuch.h $(DESTDIR)$(prefix)/include/)
+       mkdir -p $(DESTDIR)$(libdir)/
+       install -m0644 $(dir)/$(LIBNAME) $(DESTDIR)$(libdir)/
+       ln -sf $(LIBNAME) $(DESTDIR)$(libdir)/$(SONAME)
+       ln -sf $(LIBNAME) $(DESTDIR)$(libdir)/$(LINKER_NAME)
+       mkdir -p $(DESTDIR)$(prefix)/include/
+       install -m0644 $(dir)/notmuch.h $(DESTDIR)$(prefix)/include/
 
 SRCS  := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs)
-CLEAN := $(CLEAN) $(libnotmuch_modules) $(dir)/$(SONAME) $(dir)/$(LINKER_NAME) $(dir)$(LIBNAME)
+CLEAN := $(CLEAN) $(libnotmuch_modules) $(dir)/$(SONAME) $(dir)/$(LINKER_NAME) $(dir)$(LIBNAME) libnotmuch.a