From: Noah Watkins <noahwatkins@gmail.com>
Date: Sat, 21 Sep 2013 17:18:24 +0000 (-0700)
Subject: makefile-env: separate cppflags and cflags usage
X-Git-Tag: v0.71~102^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11d8d75595329f979ebd0ec0e79b2bdf0ffe5f25;p=ceph.git

makefile-env: separate cppflags and cflags usage

AM_COMMON_FLAGS included both CPP and C[XX] flags. This can cause
re-definition errors like this:

make[4]: Nothing to be done for `all-am'.
CXX      cls/version/cls_version_client.o
<command-line>: warning: "__STDC_FORMAT_MACROS" redefined

because the macro definition appears in both AM_CXXFLAGS and
AM_CPPFLAGS.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
---

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index cc9ffc62f128..900998702f51 100644
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -35,13 +35,16 @@ endif
 ##################################
 ## automake environment
 
-AM_COMMON_FLAGS = \
+AM_COMMON_CPPFLAGS = \
 	-D__CEPH__ \
 	-D_FILE_OFFSET_BITS=64 \
 	-D_REENTRANT \
 	-D_THREAD_SAFE \
 	-D__STDC_FORMAT_MACROS \
 	-D_GNU_SOURCE \
+	-DCEPH_LIBDIR=\"${libdir}\"
+
+AM_COMMON_CFLAGS = \
 	-rdynamic \
 	-Wall \
 	${WARN_TYPE_LIMITS} \
@@ -52,14 +55,11 @@ AM_COMMON_FLAGS = \
 	-fno-strict-aliasing \
 	-fsigned-char
 
-AM_CFLAGS = $(AM_COMMON_FLAGS)
-AM_CPPFLAGS = \
-	$(AM_COMMON_FLAGS) \
-	-DCEPH_LIBDIR=\"${libdir}\"
+AM_CFLAGS = $(AM_COMMON_CFLAGS)
+AM_CPPFLAGS = $(AM_COMMON_CPPFLAGS)
 AM_CXXFLAGS = \
 	@AM_CXXFLAGS@ \
-	$(AM_COMMON_FLAGS) \
-	-DCEPH_LIBDIR=\"${libdir}\" \
+	$(AM_COMMON_CFLAGS) \
 	-Wnon-virtual-dtor \
 	-Wno-invalid-offsetof \
 	-Wstrict-null-sentinel