X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2FMakefile.local;h=431902317053867987da5e412638c0bc2345a398;hb=a01956924eb5b7fd4077b1c6678cbc53faa99d43;hp=5ad0a4ca68d75db566523f866a80e453269430a3;hpb=d87db8843266caf6b11c1f2f1874328830b23878;p=notmuch diff --git a/lib/Makefile.local b/lib/Makefile.local index 5ad0a4ca..43190231 100644 --- 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 = 2 +# 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 @@ -43,11 +45,12 @@ 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 \ @@ -83,13 +86,13 @@ 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)