aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile96
-rw-r--r--Makefile.local91
2 files changed, 100 insertions, 87 deletions
diff --git a/Makefile b/Makefile
index 80eedd0..f369786 100644
--- a/Makefile
+++ b/Makefile
@@ -1,92 +1,14 @@
-SONAME = libnotmuch.so.1
-WARN_CXXFLAGS=-Wall -Wextra -Wwrite-strings -Wswitch-enum
-WARN_CFLAGS=$(WARN_CXXFLAGS) -Wmissing-declarations
-
-# 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
-
-extra_cflags :=
-extra_cxxflags :=
-
-# Now smash together user's values with our extra values
-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)
-
-all: notmuch notmuch.1.gz
-ifeq ($(MAKECMDGOALS),)
- @echo ""
- @echo "Compilation of notmuch is now complete. You can install notmuch with:"
- @echo ""
- @echo " make install"
- @echo ""
- @echo "Note that depending on the prefix to which you are installing"
- @echo "you may need root permission (such as \"sudo make install\")."
- @echo "See \"./configure --help\" for help on setting an alternate prefix."
-endif
-
-# Before including any other Makefile fragments, get settings from the
-# output of configure
-Makefile.config: configure
- @echo ""
- @echo "Note: Calling ./configure with no command-line arguments. This is often fine,"
- @echo " but if you want to specify any arguments (such as an alternate prefix"
- @echo " into which to install), call ./configure explicitly and then make again."
- @echo " See \"./configure --help\" for more details."
- @echo ""
- ./configure
+# We want the all target to be the implicit target (if no target is
+# given explicitly on the command line) so mention it first.
+all:
+# List all subdirectories here. Each contains its own Makefile.local
subdirs = compat emacs lib
-global_deps = Makefile Makefile.config Makefile.local \
+# We make all targets depend on the Makefiles themselves.
+global_deps = Makefile Makefile.local \
$(subdirs:%=%/Makefile) $(subdirs:%=%/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.
-ifeq ($(V),)
-quiet_DOC := "Use \"$(MAKE) V=1\" to see the verbose compile lines.\n"
-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)
-endif
-# Otherwise, print the full command line.
-quiet ?= $($1)
-
-%.o: %.cc $(global_deps)
- $(call quiet,CXX,$(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@
-
-%.o: %.c $(global_deps)
- $(call quiet,CC,$(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@
-
-%.elc: %.el
- $(call quiet,EMACS) -batch -f batch-byte-compile $<
-
-.deps/%.d: %.c $(global_deps)
- @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
- $(CC) -M $(CPPFLAGS) $(FINAL_CFLAGS) $< > $@.$$$$ 2>/dev/null ; \
- sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
- rm -f $@.$$$$
-
-.deps/%.d: %.cc $(global_deps)
- @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
- $(CXX) -M $(CPPFLAGS) $(FINAL_CXXFLAGS) $< > $@.$$$$ 2>/dev/null ; \
- sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
- rm -f $@.$$$$
-
-DEPS := $(SRCS:%.c=.deps/%.d)
-DEPS := $(DEPS:%.cc=.deps/%.d)
--include $(DEPS)
-
-.PHONY : clean
-clean:
- rm -f $(CLEAN); rm -rf .deps
+# Finally, include all of the Makefile.local fragments where all the
+# real work is done.
+include Makefile.local $(subdirs:%=%/Makefile.local)
diff --git a/Makefile.local b/Makefile.local
index e139395..d7cc9ed 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,3 +1,94 @@
+# Get settings from the output of configure by running it to generate
+# Makefile.config if it doesn't exist yet. And add Makefile.config to
+# our global dependency list.
+include Makefile.config
+global_deps += Makefile.config
+Makefile.config: configure
+ @echo ""
+ @echo "Note: Calling ./configure with no command-line arguments. This is often fine,"
+ @echo " but if you want to specify any arguments (such as an alternate prefix"
+ @echo " into which to install), call ./configure explicitly and then make again."
+ @echo " See \"./configure --help\" for more details."
+ @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 :=
+extra_cxxflags :=
+
+# Smash together user's values with our extra values
+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 ""
+ @echo "Compilation of notmuch is now complete. You can install notmuch with:"
+ @echo ""
+ @echo " make install"
+ @echo ""
+ @echo "Note that depending on the prefix to which you are installing"
+ @echo "you may need root permission (such as \"sudo make install\")."
+ @echo "See \"./configure --help\" for help on setting an alternate prefix."
+endif
+
+# The user has not set any verbosity, default to quiet mode and inform the
+# user how to enable verbose compiles.
+ifeq ($(V),)
+quiet_DOC := "Use \"$(MAKE) V=1\" to see the verbose compile lines.\n"
+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)
+endif
+# Otherwise, print the full command line.
+quiet ?= $($1)
+
+%.o: %.cc $(global_deps)
+ $(call quiet,CXX,$(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@
+
+%.o: %.c $(global_deps)
+ $(call quiet,CC,$(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@
+
+%.elc: %.el
+ $(call quiet,EMACS) -batch -f batch-byte-compile $<
+
+.deps/%.d: %.c $(global_deps)
+ @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+ $(CC) -M $(CPPFLAGS) $(FINAL_CFLAGS) $< > $@.$$$$ 2>/dev/null ; \
+ sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
+ rm -f $@.$$$$
+
+.deps/%.d: %.cc $(global_deps)
+ @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+ $(CXX) -M $(CPPFLAGS) $(FINAL_CXXFLAGS) $< > $@.$$$$ 2>/dev/null ; \
+ sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
+ rm -f $@.$$$$
+
+DEPS := $(SRCS:%.c=.deps/%.d)
+DEPS := $(DEPS:%.cc=.deps/%.d)
+-include $(DEPS)
+
+.PHONY : clean
+clean:
+ rm -f $(CLEAN); rm -rf .deps
+
notmuch_client_srcs = \
$(notmuch_compat_srcs) \
debugger.c \