Rework Makefile just a bit to enable adding flags for more compiler warnings

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index 86516402c2eda51d4d628f3cbb61a93240afde85..5188e5d50d9013adad266ee09d71c53f05d5392d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,40 @@
 PROGS=notmuch
 
-MYCFLAGS=-Wall -O0 -g `pkg-config --cflags glib-2.0`
-MYCXXFLAGS=$(MYCFLAGS) `xapian-config --cxxflags`
+CXXWARNINGS_FLAGS=-Wall
+CWARNINGS_FLAGS=$(CXX_WARNINGS_FLAGS)
 
-MYLDFLAGS=`pkg-config --libs glib-2.0` `xapian-config --libs`
+CDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc`
+CXXDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc` `xapian-config --cxxflags`
+
+MYCFLAGS=$(CWARNINGS_FLAGS) -O0 -g $(CDEPENDS_FLAGS)
+MYCXXFLAGS=$(CXXWARNINGS_FLAGS) -O0 -g $(CXXDEPENDS_FLAGS)
+
+MYLDFLAGS=`pkg-config --libs glib-2.0 talloc` `xapian-config --libs`
+
+MODULES=               \
+       notmuch.o       \
+       database.o      \
+       date.o          \
+       message.o       \
+       message-file.o  \
+       query.o         \
+       sha1.o          \
+       libsha1.o       \
+       xutil.o
 
 all: $(PROGS)
 
 %.o: %.cc
-       $(CXX) -c $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
+       $(CXX) -c $(CFLAGS) $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
 
 %.o: %.c
        $(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
 
-notmuch: notmuch.o database.o date.o message.o xutil.o
+notmuch: $(MODULES)
        $(CC) $(MYLDFLAGS) $^ -o $@
 
 Makefile.dep: *.c *.cc
-       $(CC) -M $(CPPFLAGS) $(MYCFLAGS) $^ > $@
+       $(CC) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $^ > $@
 -include Makefile.dep
 
 clean: