add_files_recursive: Separate scanning for directories and files for legibility.

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 5fd5d4f4c792888800e3d22707b527629495282c..933ff4c7de7f8624ce0169e535a1be0d9b2a1579 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,40 +1,39 @@
-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           \
        notmuch-time.c          \
-       gmime-filter-reply.c    \
        query-string.c          \
        show-message.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 $^ > $@
+       $(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 \
-               $(DESTDIR)$(bash_completion_dir)/notmuch
 
 install-emacs: install emacs
        for d in $(DESTDIR)/$(emacs_lispdir) ; \
@@ -44,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