X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=3c2a629963ffad204a8f5e3c9006ae55e722bb12;hp=a3a19deadcf0d14b0acc09f75420be5490743c3f;hb=357b48d34b9cd32473d39321b1ae460d05f5c7cd;hpb=53f8cc565126db4a003dbfc02850d2bf3b260636

diff --git a/Makefile.local b/Makefile.local
index a3a19dea..3c2a6299 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,8 +1,5 @@
-all: notmuch notmuch.1.gz
-
-emacs: notmuch.elc
-
 notmuch_client_srcs =		\
+	$(notmuch_compat_srcs)	\
 	debugger.c		\
 	gmime-filter-reply.c	\
 	notmuch.c		\
@@ -13,38 +10,55 @@ notmuch_client_srcs =		\
 	notmuch-reply.c		\
 	notmuch-restore.c	\
 	notmuch-search.c	\
+	notmuch-search-tags.c   \
 	notmuch-setup.c		\
 	notmuch-show.c		\
 	notmuch-tag.c		\
 	notmuch-time.c		\
 	query-string.c		\
-	show-message.c
+	show-message.c		\
+	json.c
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 notmuch: $(notmuch_client_modules) lib/notmuch.a
-	$(call quiet,CXX) $^ $(LDFLAGS) -o $@
+	$(call quiet,CXX,$(LDFLAGS)) $^ $(FINAL_LDFLAGS) -o $@
 
 notmuch.1.gz: notmuch.1
 	$(call quiet,gzip) --stdout $^ > $@
 
 install: all notmuch.1.gz
-	for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 \
-		$(DESTDIR)$(bash_completion_dir) ; \
+	for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 ; \
 	do \
 		install -d $$d ; \
 	done ;
 	install notmuch $(DESTDIR)$(prefix)/bin/
 	install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/
-	install contrib/notmuch-completion.bash \
+ifeq ($(MAKECMDGOALS), install)
+	@echo ""
+	@echo "Notmuch is now installed."
+	@echo ""
+	@echo "You may now want to install additional components to support using notmuch"
+	@echo "together with other software packages:"
+	@echo ""
+	@echo "	make install-emacs"
+	@echo "	make install-bash"
+	@echo "	make install-zsh"
+	@echo ""
+endif
+
+install-desktop:
+	install -d $(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
 
-install-emacs: install emacs
-	for d in $(DESTDIR)/$(emacs_lispdir) ; \
-	do \
-		install -d $$d ; \
-	done ;
-	install -m0644 notmuch.el $(DESTDIR)$(emacs_lispdir)
-	install -m0644 notmuch.elc $(DESTDIR)$(emacs_lispdir)
+install-zsh:
+	install -d $(DESTDIR)$(zsh_completion_dir)
+	install -m0644 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