Re-enable the warning for unused parameters.

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index bf3a5200ff74b99e47c94e0b674c762c3294b2e1..6e3ab26d3b8bc069c41ea85341d448be89d4b4fc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,41 @@
-PROGS=notmuch-index-message xapian-dump
+PROGS=notmuch
 
-MYCXXFLAGS=-Wall
+CXXWARNINGS_FLAGS=-Wall -Wextra
+CWARNINGS_FLAGS=$(CXXWARNINGS_FLAGS)
+
+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)
 
-notmuch-index-message: notmuch-index-message.cc
-       $(CC) $(CXXFLAGS) $(MYCXXFLAGS) notmuch-index-message.cc `pkg-config --cflags --libs gmime-2.4` `xapian-config --cxxflags --libs` -o notmuch-index-message
+%.o: %.cc
+       $(CXX) -c $(CFLAGS) $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
+
+%.o: %.c
+       $(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
+
+notmuch: $(MODULES)
+       $(CC) $(MYLDFLAGS) $^ -o $@
 
-xapian-dump: xapian-dump.cc
-       $(CXX) $(CXXFLAGS) $(MYCXXFLAGS) xapian-dump.cc `xapian-config --libs --cxxflags` -o xapian-dump
+Makefile.dep: *.c *.cc
+       $(CC) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $^ > $@
+-include Makefile.dep
 
 clean:
-       rm -f $(PROGS)
+       rm -f $(PROGS) *.o Makefile.dep