X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=2d5409659ec3e1930e40a37d41020b05c154ebf6;hp=28286597e8cc4685a51730dc3d4138fcbef89564;hb=3650f4d1950e923ea5d28e76a321ce0d62f810de;hpb=986f6c98244610da6bba88d0c92895b9758973ee

diff --git a/Makefile.local b/Makefile.local
index 28286597..2d540965 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,17 +1,18 @@
-all: notmuch notmuch.1.gz
-
 emacs: notmuch.elc
 
 notmuch_client_srcs =		\
+	$(notmuch_compat_srcs)	\
 	debugger.c		\
 	gmime-filter-reply.c	\
 	notmuch.c		\
 	notmuch-config.c	\
+	notmuch-count.c		\
 	notmuch-dump.c		\
 	notmuch-new.c		\
 	notmuch-reply.c		\
 	notmuch-restore.c	\
 	notmuch-search.c	\
+	notmuch-search-tags.c   \
 	notmuch-setup.c		\
 	notmuch-show.c		\
 	notmuch-tag.c		\
@@ -21,23 +22,20 @@ notmuch_client_srcs =		\
 
 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) ; \
+install: all notmuch.1.gz install-emacs install-bash
+	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 \
-		$(DESTDIR)$(bash_completion_dir)/notmuch
 
-install-emacs: install emacs
+install-emacs: emacs
 	for d in $(DESTDIR)/$(emacs_lispdir) ; \
 	do \
 		install -d $$d ; \
@@ -45,5 +43,10 @@ install-emacs: install emacs
 	install -m0644 notmuch.el $(DESTDIR)$(emacs_lispdir)
 	install -m0644 notmuch.elc $(DESTDIR)$(emacs_lispdir)
 
+install-bash:
+	install -d $(DESTDIR)$(bash_completion_dir)
+	install -m0644 contrib/notmuch-completion.bash \
+		$(DESTDIR)$(bash_completion_dir)/notmuch
+
 SRCS  := $(SRCS) $(notmuch_client_srcs)
 CLEAN := $(CLEAN) notmuch $(notmuch_client_modules) notmuch.elc notmuch.1.gz