diff options
| author | Noah Watkins <noahwatkins@gmail.com> | 2013-09-21 10:18:24 -0700 |
|---|---|---|
| committer | Noah Watkins <noahwatkins@gmail.com> | 2013-09-21 10:24:04 -0700 |
| commit | 11d8d75595329f979ebd0ec0e79b2bdf0ffe5f25 (patch) | |
| tree | e4a393711ff17947197081d0fcba84c76921905e | |
| parent | 08a97ae45f4df58a6a8ea8a6400934d860cf5eb4 (diff) | |
| download | ceph-11d8d75595329f979ebd0ec0e79b2bdf0ffe5f25.tar.gz | |
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>
| -rw-r--r-- | src/Makefile-env.am | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Makefile-env.am b/src/Makefile-env.am index cc9ffc62f12..900998702f5 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 |