Merge branch 'debian'

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 74f0f866ec442aa0bb3232dbdaf8cc8136a08645..68823241a09f2e92a6fdcfc4107f22b843a9b1c5 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -42,7 +42,8 @@ extra_cxxflags :=
 # Smash together user's values with our extra values
 FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
 FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
 # Smash together user's values with our extra values
 FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
 FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)

-FINAL_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS)
+FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Llib -lnotmuch
+FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS)

 
 .PHONY: all
 all: notmuch notmuch-shared notmuch.1.gz
 
 .PHONY: all
 all: notmuch notmuch-shared notmuch.1.gz


@@ -148,31 +149,20 @@ release-verify-newer: release-verify-version
 # user how to enable verbose compiles.
 ifeq ($(V),)
 quiet_DOC := "Use \"$(MAKE) V=1\" to see the verbose compile lines.\n"
 # 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:=)"  %12s $@\n" "$1 $2"; $($1)
-quiet_args = @printf $(quiet_DOC)$(eval quiet_DOC:=)"  %12s$2\n" $1; $($1) $2
+quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)"$1 $@\n"; $($(shell echo $1 | sed -e s'/ .*//'))

 endif
 # The user has explicitly enabled quiet compilation.
 ifeq ($(V),0)
 endif
 # The user has explicitly enabled quiet compilation.
 ifeq ($(V),0)

-quiet = @printf "  %12s $@\n" "$1 $2"; $($1)
-quiet_args = @printf "  %12s$2\n" $1; $($1) $2
+quiet = @printf "$1 $@\n"; $($(shell echo $1 | sed -e s'/ .*//'))

 endif
 # Otherwise, print the full command line.
 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)
+quiet ?= $($(shell echo $1 | sed -e s'/ .*//'))

 
 %.o: %.cc $(global_deps)
 
 %.o: %.cc $(global_deps)

-       $(call quiet,CXX,$(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@
+       $(call quiet,CXX $(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@

 
 %.o: %.c $(global_deps)
 
 %.o: %.c $(global_deps)

-       $(call quiet,CC,$(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@
-
-%.elc: %.el
-       $(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<
+       $(call quiet,CC $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@

 
 .deps/%.d: %.c $(global_deps)
        @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
 
 .deps/%.d: %.c $(global_deps)
        @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \


@@ -194,6 +184,11 @@ DEPS := $(DEPS:%.cc=.deps/%.d)
 clean:
        rm -f $(CLEAN); rm -rf .deps
 
 clean:
        rm -f $(CLEAN); rm -rf .deps
 

+# We don't (yet) have any distributed files not in the upstream repository.
+# So distclean is currently identical to clean.
+.PHONY: distclean
+distclean: clean
+

 notmuch_client_srcs =          \
        $(notmuch_compat_srcs)  \
        debugger.c              \
 notmuch_client_srcs =          \
        $(notmuch_compat_srcs)  \
        debugger.c              \


@@ -218,49 +213,35 @@ notmuch_client_srcs =             \
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 
 notmuch: $(notmuch_client_modules) lib/libnotmuch.a
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 
 notmuch: $(notmuch_client_modules) lib/libnotmuch.a

-       $(call quiet,CC,$(LDFLAGS)) $^ $(FINAL_LDFLAGS) -o $@
+       $(call quiet,CC $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@

 
 notmuch-shared: $(notmuch_client_modules) lib/libnotmuch.so
 
 notmuch-shared: $(notmuch_client_modules) lib/libnotmuch.so

-       $(call quiet,CC,$(LDFLAGS)) -Llib -lnotmuch $(notmuch_client_modules) $(FINAL_LDFLAGS) -o $@
+       $(call quiet,CC $(CFLAGS)) $(notmuch_client_modules) $(FINAL_NOTMUCH_LDFLAGS) -o $@

 
 notmuch.1.gz: notmuch.1
 
 notmuch.1.gz: notmuch.1

-       $(call quiet,gzip) --stdout $^ > $@
+       gzip --stdout $^ > $@

 
 .PHONY: install
 install: all notmuch.1.gz
 
 .PHONY: install
 install: all notmuch.1.gz

-       $(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/)
+       mkdir -p $(DESTDIR)$(mandir)/man1
+       install -m0644 notmuch.1.gz $(DESTDIR)$(mandir)/man1/
+       mkdir -p $(DESTDIR)$(prefix)/bin/
+       install notmuch-shared $(DESTDIR)$(prefix)/bin/notmuch

 ifeq ($(MAKECMDGOALS), install)
        @echo ""
 ifeq ($(MAKECMDGOALS), install)
        @echo ""

-       @echo "Notmuch is now installed."
+       @echo "Notmuch is now installed to $(DESTDIR)$(prefix)"

        @echo ""
        @echo ""

-       @echo "You may now want to install additional components to support using notmuch"
-       @echo "together with other software packages:"
+       @echo "To run notmuch from emacs, each user should add the following line to ~/.emacs:"

        @echo ""
        @echo ""

-       @echo " make install-emacs"
-       @echo " make install-bash"
-       @echo " make install-zsh"
+       @echo " (require 'notmuch)"

        @echo ""
        @echo ""

+       @echo "And should then run \"M-x notmuch\" from within emacs or run \"emacs -f notmuch\""

 endif
 
 .PHONY: install-desktop
 install-desktop:
 endif
 
 .PHONY: install-desktop
 install-desktop:

-       $(call quiet,MKDIR) $(DESTDIR)$(desktop_dir)
+       mkdir -p $(DESTDIR)$(desktop_dir)

        desktop-file-install --mode 0644 --dir $(DESTDIR)$(desktop_dir) notmuch.desktop
 
        desktop-file-install --mode 0644 --dir $(DESTDIR)$(desktop_dir) notmuch.desktop
 

-.PHONY: install-bash
-install-bash:
-       $(call quiet-mkdir, $(DESTDIR)$(bash_completion_dir))
-       $(call quiet_install_data, contrib/notmuch-completion.bash $(DESTDIR)$(bash_completion_dir)/notmuch)
-
-.PHONY: install-zsh
-install-zsh:
-       $(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-shared $(notmuch_client_modules) notmuch.elc notmuch.1.gz
 SRCS  := $(SRCS) $(notmuch_client_srcs)
 CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) notmuch.elc notmuch.1.gz