X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=31c8de75570439fda17098e7b066c5a9e92e379d;hp=1737a32e61dee659c9568e657e7c33577f06166b;hb=1a6208bfbd2eeba3da5e570c33506515b115c42e;hpb=526b7144f7d692e04ce950dfa7d0ee1bdf792cdc

diff --git a/Makefile b/Makefile
index 1737a32e..31c8de75 100644
--- a/Makefile
+++ b/Makefile
@@ -1,35 +1,44 @@
-PROGS=notmuch
+# Default FLAGS, (can be overriden by user such as "make CFLAGS=-O2")
+WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
+CFLAGS=-g -O0
 
-MYCFLAGS=-Wall -O0 -g `pkg-config --cflags glib-2.0 talloc`
-MYCXXFLAGS=$(MYCFLAGS) `xapian-config --cxxflags`
+# Additional flags that we will append to whatever the user set.
+# These aren't intended for the user to manipulate.
+extra_cflags = -I./lib `pkg-config --cflags glib-2.0 gmime-2.4 talloc`
+extra_cxxflags = `xapian-config --cxxflags`
 
-MYLDFLAGS=`pkg-config --libs glib-2.0 talloc` `xapian-config --libs`
+# Now smash together user's values with our extra values
+override CFLAGS := $(CFLAGS) $(WARN_FLAGS) $(extra_cflags)
+override CXXFLAGS := $(CXXFLAGS) $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
 
-MODULES=		\
-	notmuch.o	\
-	database.o	\
-	date.o		\
-	message.o	\
-	message-file.o	\
-	query.o		\
-	sha1.o		\
-	libsha1.o	\
-	xutil.o
+override LDFLAGS := $(LDFLAGS) `pkg-config --libs glib-2.0 gmime-2.4 talloc` \
+			       `xapian-config --libs`
 
-all: $(PROGS)
+# Include our local Makfile.local first so that its first target is default
+include Makefile.local
+include lib/Makefile.local
 
 %.o: %.cc
-	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
+	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $< -o $@
 
 %.o: %.c
-	$(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
+	$(CC) -c $(CFLAGS) $< -o $@
 
-notmuch: $(MODULES)
-	$(CC) $(MYLDFLAGS) $^ -o $@
+.deps/%.d: %.c
+	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+	$(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \
+	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
 
-Makefile.dep: *.c *.cc
-	$(CC) -M $(CPPFLAGS) $(MYCFLAGS) $^ > $@
--include Makefile.dep
+.deps/%.d: %.cc
+	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+	$(CXX) -M $(CPPFLAGS) $(CXXFLAGS) $< > $@.$$$$; \
+	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
+
+DEPS := $(SRCS:%.c=.deps/%.d)
+DEPS := $(DEPS:%.cc=.deps/%.d)
+-include $(DEPS)
 
 clean:
-	rm -f $(PROGS) *.o Makefile.dep
+	rm -f $(CLEAN); rm -rf .deps