X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=ae0f99120cc59c459c3b8d0e4819611e7c8b5c62;hp=91ab9c02cd623f583e03b5b241858f4b0fb40f43;hb=98b93a7d5ad3713a7c408e497065cd0a931d90c7;hpb=c5dccd851a8b79d8cedbfc8f2d2b8f9be2b7fa5a

diff --git a/Makefile b/Makefile
index 91ab9c02..ae0f9912 100644
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,83 @@
+# Default FLAGS, (can be overridden by user such as "make CFLAGS=-O2")
 WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
+CFLAGS=-O2
 
-NOTMUCH_DEPENDS_FLAGS=-I./lib `pkg-config --cflags glib-2.0 gmime-2.4 talloc`
-NOTMUCH_CXX_DEPENDS_FLAGS=$(NOTMUCH_DEPENDS_FLAGS) `xapian-config --cxxflags`
+# Additional programs that are used during the compilation process.
+EMACS ?= emacs
+# Lowercase to avoid clash with GZIP environment variable for passing
+# arguments to gzip.
+gzip = gzip
 
-NOTMUCH_CFLAGS=$(WARN_FLAGS) -O0 -g $(NOTMUCH_DEPENDS_FLAGS)
-NOTMUCH_CXXFLAGS=$(WARN_FLAGS) -O0 -g $(NOTMUCH_CXX_DEPENDS_FLAGS)
+# Additional flags that we will append to whatever the user set.
+# These aren't intended for the user to manipulate.
+extra_cflags := $(shell pkg-config --cflags glib-2.0 gmime-2.4 talloc)
+extra_cxxflags := $(shell xapian-config --cxxflags)
 
-NOTMUCH_LDFLAGS=`pkg-config --libs glib-2.0 gmime-2.4 talloc` \
-		`xapian-config --libs`
+emacs_lispdir := $(shell pkg-config emacs --variable sitepkglispdir)
+# Hard-code if this system doesn't have an emacs.pc file
+ifeq ($(emacs_lispdir),)
+	emacs_lispdir = $(prefix)/share/emacs/site-lisp
+endif
 
-# Include our local Makfile.local first so that its first target is default
+all_deps = Makefile Makefile.local Makefile.config \
+		   lib/Makefile lib/Makefile.local
+
+# Now smash together user's values with our extra values
+override CFLAGS += $(WARN_FLAGS) $(extra_cflags)
+override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
+
+override LDFLAGS += \
+	$(shell pkg-config --libs glib-2.0 gmime-2.4 talloc) \
+	$(shell xapian-config --libs)
+
+# Include our local Makefile.local first so that its first target is default
 include Makefile.local
 include lib/Makefile.local
 
-%.o: %.cc
-	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $(NOTMUCH_CXXFLAGS) $< -o $@
+# And get user settings from the output of configure
+Makefile.config: configure
+	./configure
 
-%.o: %.c
-	$(CC) -c $(CFLAGS) $(NOTMUCH_CFLAGS) $< -o $@
+include Makefile.config
 
-.depends: $(SRCS)
-	$(CXX) -M $(CPPFLAGS) $(NOTMUCH_DEPENDS_FLAGS) \
-	$(NOTMUCH_CXX_DEPENDS_FLAGS) $^ > $@
--include .depends
+# 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 = @echo $(quiet_DOC)$(eval quiet_DOC:=)"  $1	$@"; $($1)
+endif
+# The user has explicitly enabled quiet compilation.
+ifeq ($(V),0)
+quiet = @echo "  $1	$@"; $($1)
+endif
+# Otherwise, print the full command line.
+quiet ?= $($1)
 
-CLEAN := $(CLEAN) .depends
+%.o: %.cc $(all_deps)
+	$(call quiet,CXX) -c $(CXXFLAGS) $< -o $@
 
-clean:
-	rm -f $(CLEAN)
+%.o: %.c $(all_deps)
+	$(call quiet,CC) -c $(CFLAGS) $< -o $@
 
+%.elc: %.el
+	$(call quiet,EMACS) -batch -f batch-byte-compile $<
 
+.deps/%.d: %.c $(all_deps)
+	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+	$(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \
+	sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
+
+.deps/%.d: %.cc $(all_deps)
+	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+	$(CXX) -M $(CPPFLAGS) $(CXXFLAGS) $< > $@.$$$$; \
+	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