X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=Makefile.local;h=d9fd1d93a8b617f657cc9069984b0284356abc6a;hb=e7131a5983c4caff45c97e69b979002f0c1ff381;hp=d7cc9edc2c4662d8beb6a2cac15dd4cf185e1ab1;hpb=784e55d0f990350d0be8e54892f0eb3afe087fc5;p=notmuch

diff --git a/Makefile.local b/Makefile.local
index d7cc9edc..d9fd1d93 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -12,10 +12,6 @@ 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 :=
@@ -26,15 +22,6 @@ FINAL_CFLAGS = $(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
 ifeq ($(MAKECMDGOALS),)
 	@echo ""
@@ -55,7 +42,7 @@ quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)"  $1 $2	$@\n"; $($1)
 endif
 # The user has explicitly enabled quiet compilation.
 ifeq ($(V),0)
-quiet = @printf "  $1	$@\n"; $($1)
+quiet = @printf "  $1 $2	$@\n"; $($1)
 endif
 # Otherwise, print the full command line.
 quiet ?= $($1)
@@ -118,15 +105,11 @@ 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 -d $(DESTDIR)$(prefix)/bin/
+	install -d $(DESTDIR)$(libdir)/
+	install -d $(DESTDIR)$(prefix)/include/
+	install -d $(DESTDIR)$(prefix)/share/man/man1
 	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 ""