debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-23 01:44:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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).
This commit is contained in:
Carl Worth 2010-03-31 22:47:12 -07:00
parent 649b1609a1
commit 7b52b2c318
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile.local
View file

@ -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 ""

10
lib/Makefile.local
View file

@ -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