X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=46f001ce2fa5d2523ff08c577b4aadbecae853fa;hp=7a59ce0ade5dbebc997aa0b92570c36722768493;hb=86232e62ab0ed6948de24a6aab5d9f2558171acf;hpb=f47bec55bda2f4ef745ba6a284545bd8d1f9fbcc

diff --git a/Makefile b/Makefile
index 7a59ce0a..46f001ce 100644
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,6 @@ gzip = gzip
 bash_completion_dir = /etc/bash_completion.d
 zsh_completion_dir = /usr/share/zsh/functions/Completion/Unix
 
-global_deps = Makefile Makefile.local Makefile.config \
-		   lib/Makefile lib/Makefile.local
-
 extra_cflags :=
 extra_cxxflags :=
 
@@ -44,12 +41,12 @@ Makefile.config: configure
 	@echo ""
 	./configure
 
-include Makefile.config
+subdirs = compat emacs lib
+
+global_deps = Makefile Makefile.config Makefile.local \
+	$(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
 
-include lib/Makefile.local
-include compat/Makefile.local
-include emacs/Makefile.local
-include Makefile.local
+include Makefile.config Makefile.local $(subdirs:%=%/Makefile.local)
 
 # The user has not set any verbosity, default to quiet mode and inform the
 # user how to enable verbose compiles.