From: Carl Worth <cworth@cworth.org>
Date: Thu, 1 Apr 2010 05:47:12 +0000 (-0700)
Subject: Move installation of library from top-level to lib/Makefile.local
X-Git-Tag: 0.1~29
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=7b52b2c318e449c73146bd48c7f32145f158f3f5

Move installation of library from top-level to lib/Makefile.local

We had a fairly ugly violation of modularity with the top-level
Makefile.local isntalling everything, (even when the build commands
for the library were down in lib/Makefile.local).
---

diff --git a/Makefile.local b/Makefile.local
index aa822f6a..135d26e8 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -104,8 +104,6 @@ notmuch: $(notmuch_client_modules) lib/libnotmuch.so
 notmuch.1.gz: notmuch.1
 	$(call quiet,gzip) --stdout $^ > $@
 
-SONAME = libnotmuch.so.1
-
 install: all notmuch.1.gz
 	for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(libdir)/ \
 		$(DESTDIR)$(prefix)/include/ $(DESTDIR)$(prefix)/share/man/man1 ; \
@@ -113,9 +111,6 @@ install: all notmuch.1.gz
 		install -d $$d ; \
 	done ;
 	install notmuch $(DESTDIR)$(prefix)/bin/
-	install lib/$(SONAME) $(DESTDIR)$(libdir)/
-	install lib/notmuch.h $(DESTDIR)$(prefix)/include/
-	ln -sf $(SONAME) $(DESTDIR)$(libdir)/libnotmuch.so
 	install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/
 ifeq ($(MAKECMDGOALS), install)
 	@echo ""
diff --git a/lib/Makefile.local b/lib/Makefile.local
index 7105070b..b24a3571 100644
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -1,3 +1,5 @@
+SONAME = libnotmuch.so.1
+
 dir := lib
 extra_cflags += -I$(dir) -fPIC
 
@@ -25,5 +27,13 @@ $(dir)/$(SONAME) : $(libnotmuch_modules)
 $(dir)/libnotmuch.so: $(dir)/$(SONAME)
 	ln -fs $(SONAME) $@
 
+install: install-$(dir)
+
+install-$(dir):
+	install -d $(DESTDIR)$(libdir)/
+	install $(dir)/$(SONAME) $(DESTDIR)$(libdir)/
+	install $(dir)/notmuch.h $(DESTDIR)$(prefix)/include/
+	ln -sf $(SONAME) $(DESTDIR)$(libdir)/libnotmuch.so
+
 SRCS  := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs)
 CLEAN := $(CLEAN) $(libnotmuch_modules) $(dir)/$(SONAME) $(dir)/libnotmuch.so *.so