From: Carl Worth <cworth@cworth.org>
Date: Wed, 2 Dec 2009 00:42:50 +0000 (-0800)
Subject: Makefile: Split warnings into two sets (WARN_CFLAGS and WARN_CXXFLAGS)
X-Git-Tag: 0.1~258
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e806e723c8ac8f97a3f8ba0e0048708a8f5bb475;p=notmuch.git

Makefile: Split warnings into two sets (WARN_CFLAGS and WARN_CXXFLAGS)

Some C++ compilers complain about -Wmissing-declarations not being
valid, so avoid passing it except when compiling a C file.
---

diff --git a/Makefile b/Makefile
index 7a9e44c6..6a2ecea5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
-# Default FLAGS, (can be overridden by user such as "make CFLAGS=-O2")
-WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
+# Default FLAGS, (can be overridden by user such as "make CFLAGS=-g")
 CFLAGS=-O2
 
+WARN_CXXFLAGS=-Wall -Wextra -Wwrite-strings -Wswitch-enum
+WARN_CFLAGS=$(WARN_CXXFLAGS) -Wmissing-declarations
+
 # Additional programs that are used during the compilation process.
 EMACS ?= emacs
 # Lowercase to avoid clash with GZIP environment variable for passing
@@ -25,8 +27,8 @@ 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 CFLAGS += $(WARN_CFLAGS) $(extra_cflags)
+override CXXFLAGS += $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
 
 override LDFLAGS += \
 	$(shell pkg-config --libs glib-2.0 gmime-2.4 talloc) \