Add -Wmising-declarations and fix warnings.

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index 13f2b28d3f4a2081f4fd1b2075ec5ad1fbea3290..894874ae6f2d3502a5f7eaaf3424e3511e83ba05 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,13 @@
 PROGS=notmuch
 
 PROGS=notmuch
 

-MYCFLAGS=-Wall -O0 -g `pkg-config --cflags glib-2.0 talloc`
-MYCXXFLAGS=$(MYCFLAGS) `xapian-config --cxxflags`
+CXXWARNINGS_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings
+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`
 
 
 MYLDFLAGS=`pkg-config --libs glib-2.0 talloc` `xapian-config --libs`
 


@@ -19,7 +25,7 @@ MODULES=              \
 all: $(PROGS)
 
 %.o: %.cc
 all: $(PROGS)
 
 %.o: %.cc

-       $(CXX) -c $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
+       $(CXX) -c $(CFLAGS) $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@

 
 %.o: %.c
        $(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
 
 %.o: %.c
        $(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@


@@ -28,7 +34,7 @@ notmuch: $(MODULES)
        $(CC) $(MYLDFLAGS) $^ -o $@
 
 Makefile.dep: *.c *.cc
        $(CC) $(MYLDFLAGS) $^ -o $@
 
 Makefile.dep: *.c *.cc

-       $(CC) -M $(CPPFLAGS) $(MYCFLAGS) $^ > $@
+       $(CC) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $^ > $@

 -include Makefile.dep
 
 clean:
 -include Makefile.dep
 
 clean: