From 4b547cbb52d29371e26622747f824b4498376f56 Mon Sep 17 00:00:00 2001
From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Fri, 22 Apr 2011 16:30:51 -0700
Subject: Makefile: add some new warnings to CXXFLAGS

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
---
 do_autogen.sh   |  4 ----
 src/Makefile.am | 11 ++++++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/do_autogen.sh b/do_autogen.sh
index b3f7f0e5e89..8957740dd52 100755
--- a/do_autogen.sh
+++ b/do_autogen.sh
@@ -8,7 +8,6 @@ do_autogen.sh: make a ceph build by running autogen, etc.
 -d <level>                       debug build
                                  level 0: no debug
                                  level 1: -g
-                                 level 2: -Wall
                                  level 3: -Wextra
                                  level 4: even more...
 -P                               profiling build
@@ -58,9 +57,6 @@ fi
 if [ "${debug_level}" -ge 1 ]; then
     CFLAGS="${CFLAGS} -g"
 fi
-if [ "${debug_level}" -ge 2 ]; then
-    CFLAGS="${CFLAGS} -Wall -Wvolatile-register-var"
-fi
 if [ "${debug_level}" -ge 3 ]; then
     CFLAGS="${CFLAGS} -Wextra \
 -Wno-missing-field-initializers -Wno-missing-declarations"
diff --git a/src/Makefile.am b/src/Makefile.am
index 004463590be..9f3998a7788 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -478,16 +478,17 @@ CLEANFILES += \
 
 ##
 
+AM_COMMON_FLAGS = -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic \
+-Wtype-limits -Wignored-qualifiers
+
+AM_CFLAGS = $(AM_COMMON_FLAGS)
+AM_CXXFLAGS = $(AM_COMMON_FLAGS) -Wnon-virtual-dtor -Wno-invalid-offsetof
+AM_LDFLAGS = -Wl,--as-needed
 
-AM_CXXFLAGS = -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic -Wnon-virtual-dtor
 if USE_BOOST_SPIRIT_OLD_HDR
 AM_CXXFLAGS += -DUSE_BOOST_SPIRIT_OLD_HDR
 endif
 
-AM_CFLAGS = -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic
-AM_CXXFLAGS += -Wno-invalid-offsetof
-AM_LDFLAGS = -Wl,--as-needed
-
 if WITH_LIBATOMIC
 AM_LDFLAGS += -latomic_ops
 endif
-- 
cgit v1.2.1