Makefile: Move compat sources from the client code to the library.

[notmuch] / lib / Makefile.local

diff --git a/lib/Makefile.local b/lib/Makefile.local
index c98fb6734cc3ee98a3056909ebe5fde12fdb1629..dc608ef0994c4b86b76ec3af16c23a5fb5fc7981 100644 (file)
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -30,6 +30,7 @@ dir := lib
 extra_cflags += -I$(dir) -fPIC
 
 libnotmuch_c_srcs =            \
+       $(notmuch_compat_srcs)  \
        $(dir)/libsha1.c        \
        $(dir)/message-file.c   \
        $(dir)/messages.c       \
@@ -51,23 +52,23 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules)
        $(call quiet,AR) rcs $@ $^
 
 $(dir)/$(LIBNAME): $(libnotmuch_modules)
-       $(call quiet,CXX,$(LDFLAGS)) $^ $(FINAL_LDFLAGS) -shared -Wl,-soname=$(SONAME) -o $@
+       $(call quiet,CXX $(CXXFLAGS)) $^ $(FINAL_LIBNOTMUCH_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)$(includedir)
+       install -m0644 $(dir)/notmuch.h $(DESTDIR)$(includedir)/
 
 SRCS  := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs)
 CLEAN := $(CLEAN) $(libnotmuch_modules) $(dir)/$(SONAME) $(dir)/$(LINKER_NAME) $(dir)$(LIBNAME) libnotmuch.a