diff options
| author | Sage Weil <sage@inktank.com> | 2013-09-23 10:12:16 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-09-23 10:12:16 -0700 |
| commit | 6b745c9491094475aa011a5ea175abb68d7ba0e8 (patch) | |
| tree | fb6e6cb6780b574f7ae65d959f654c4007f7bbf5 | |
| parent | 2299c4dbf23ff2360be266d92b6ad13ce31bf12b (diff) | |
| parent | 0a439745c4b3c251d90badd80bd79151f2c4a4c5 (diff) | |
| download | ceph-6b745c9491094475aa011a5ea175abb68d7ba0e8.tar.gz | |
Merge pull request #616 from ceph/automake-flags
automake: fixup am_common_flags to avoid re-definitions
Reviewed-by: Roald J. van Loon <roaldvanloon@gmail.com>
| -rw-r--r-- | src/Makefile-env.am | 14 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 8 insertions, 8 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 diff --git a/src/Makefile.am b/src/Makefile.am index c0ed016006d..ed07a91e3ae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -112,7 +112,7 @@ libcephfs_jni_la_SOURCES = \ java/native/JniConstants.cpp \ java/native/JniConstants.h libcephfs_jni_la_LIBADD = $(LIBCEPHFS) $(EXTRALIBS) -libcephfs_jni_la_CPPFLAGS = $(JDK_CPPFLAGS) +libcephfs_jni_la_CPPFLAGS = $(JDK_CPPFLAGS) $(AM_CPPFLAGS) libcephfs_jni_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 lib_LTLIBRARIES += libcephfs_jni.la endif |