X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=e9f86e0d703c696c785d3619df0e9299905ce3fd;hp=d7cc9edc2c4662d8beb6a2cac15dd4cf185e1ab1;hb=b2a9fcd5cfd1bf84321b8bf53b37e7fb98618d6e;hpb=784e55d0f990350d0be8e54892f0eb3afe087fc5 diff --git a/Makefile.local b/Makefile.local index d7cc9edc..e9f86e0d 100644 --- a/Makefile.local +++ b/Makefile.local @@ -1,3 +1,15 @@ +# Here's the (hopefully simple) versioning scheme. +# +# Releases of notmuch have a two-digit version (0.1, 0.2, etc.). We +# increment the second digit for each release and increment the first +# digit when we reach particularly major milestones of usability. +# +# Between releases, (such as when compiling notmuch from the git +# repository), we add a third digit, (0.1.1, 0.1.2, etc.), and +# increment it occasionally, (such as after a big batch of commits are +# merged. +NOTMUCH_VERSION=0.1 + # Get settings from the output of configure by running it to generate # Makefile.config if it doesn't exist yet. And add Makefile.config to # our global dependency list. @@ -12,30 +24,17 @@ Makefile.config: configure @echo "" ./configure -SONAME = libnotmuch.so.1 -WARN_CXXFLAGS=-Wall -Wextra -Wwrite-strings -Wswitch-enum -WARN_CFLAGS=$(WARN_CXXFLAGS) -Wmissing-declarations - # Sub-directory Makefile.local fragments can append to these variables # to have directory-specific cflags as necessary. extra_cflags := extra_cxxflags := # Smash together user's values with our extra values -FINAL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags) +FINAL_CFLAGS = -DNOTMUCH_VERSION=$(NOTMUCH_VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags) FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) FINAL_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS) -# Additional programs that are used during the compilation process. -EMACS ?= emacs --quick -# Lowercase to avoid clash with GZIP environment variable for passing -# arguments to gzip. -gzip = gzip - -bash_completion_dir = /etc/bash_completion.d -zsh_completion_dir = /usr/share/zsh/functions/Completion/Unix - -all: notmuch notmuch.1.gz +all: notmuch notmuch-shared notmuch.1.gz ifeq ($(MAKECMDGOALS),) @echo "" @echo "Compilation of notmuch is now complete. You can install notmuch with:" @@ -51,14 +50,22 @@ endif # user how to enable verbose compiles. ifeq ($(V),) quiet_DOC := "Use \"$(MAKE) V=1\" to see the verbose compile lines.\n" -quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)" $1 $2 $@\n"; $($1) +quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)" %12s $@\n" "$1 $2"; $($1) +quiet_args = @printf $(quiet_DOC)$(eval quiet_DOC:=)" %12s$2\n" $1; $($1) $2 endif # The user has explicitly enabled quiet compilation. ifeq ($(V),0) -quiet = @printf " $1 $@\n"; $($1) +quiet = @printf " %12s $@\n" "$1 $2"; $($1) +quiet_args = @printf " %12s$2\n" $1; $($1) $2 endif # Otherwise, print the full command line. quiet ?= $($1) +quiet_args ?= $($1) $2 + +quiet_mkdir = $(call quiet_args,MKDIR,$1) +quiet_install_bin = $(call quiet_args,INSTALL-BIN,$1) +quiet_install_data = $(call quiet_args,INSTALL-DATA,$1) +quiet_symlink = $(call quiet_args,SYMLINK,$1) %.o: %.cc $(global_deps) $(call quiet,CXX,$(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@ @@ -111,23 +118,23 @@ notmuch_client_srcs = \ json.c notmuch_client_modules = $(notmuch_client_srcs:.c=.o) -notmuch: $(notmuch_client_modules) lib/libnotmuch.so - $(call quiet,CC,$(LDFLAGS)) -Llib -lnotmuch $(filter-out lib/libnotmuch.so,$^) $(FINAL_LDFLAGS) -o $@ + +notmuch: $(notmuch_client_modules) lib/libnotmuch.a + $(call quiet,CC,$(LDFLAGS)) $^ $(FINAL_LDFLAGS) -o $@ + +notmuch-shared: $(notmuch_client_modules) lib/libnotmuch.so + $(call quiet,CC,$(LDFLAGS)) -Llib -lnotmuch $(notmuch_client_modules) $(FINAL_LDFLAGS) -o $@ notmuch.1.gz: notmuch.1 $(call quiet,gzip) --stdout $^ > $@ install: all notmuch.1.gz - for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(libdir)/ \ - $(DESTDIR)$(prefix)/include/ $(DESTDIR)$(prefix)/share/man/man1 ; \ - do \ - 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/ + $(call quiet_mkdir, $(DESTDIR)$(prefix)/bin/) + $(call quiet_mkdir, $(DESTDIR)$(libdir)/) + $(call quiet_mkdir, $(DESTDIR)$(prefix)/include/) + $(call quiet_mkdir, $(DESTDIR)$(prefix)/share/man/man1) + $(call quiet_install_bin, notmuch-shared $(DESTDIR)$(prefix)/bin/notmuch) + $(call quiet_install_data, notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/) ifeq ($(MAKECMDGOALS), install) @echo "" @echo "Notmuch is now installed." @@ -142,18 +149,16 @@ ifeq ($(MAKECMDGOALS), install) endif install-desktop: - install -d $(DESTDIR)$(desktop_dir) + $(call quiet,MKDIR) $(DESTDIR)$(desktop_dir) desktop-file-install --mode 0644 --dir $(DESTDIR)$(desktop_dir) notmuch.desktop install-bash: - install -d $(DESTDIR)$(bash_completion_dir) - install -m0644 contrib/notmuch-completion.bash \ - $(DESTDIR)$(bash_completion_dir)/notmuch + $(call quiet-mkdir, $(DESTDIR)$(bash_completion_dir)) + $(call quiet_install_data, contrib/notmuch-completion.bash $(DESTDIR)$(bash_completion_dir)/notmuch) install-zsh: - install -d $(DESTDIR)$(zsh_completion_dir) - install -m0644 contrib/notmuch-completion.zsh \ - $(DESTDIR)$(zsh_completion_dir)/notmuch + $(call quiet_mkdir, $(DESTDIR)$(zsh_completion_dir)) + $(call quiet_install_data, contrib/notmuch-completion.zsh $(DESTDIR)$(zsh_completion_dir)/notmuch) SRCS := $(SRCS) $(notmuch_client_srcs) -CLEAN := $(CLEAN) notmuch $(notmuch_client_modules) notmuch.elc notmuch.1.gz +CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) notmuch.elc notmuch.1.gz