diff options
| author | Noah Watkins <noahwatkins@gmail.com> | 2013-09-23 08:19:23 -0700 |
|---|---|---|
| committer | Noah Watkins <noahwatkins@gmail.com> | 2013-09-23 13:07:12 -0700 |
| commit | 27fb44b358a15bd77f78c26c836d957a9a5654ad (patch) | |
| tree | 6b8da3f8bb33451e3802e8d89907941c5a7ab05b | |
| parent | 08a97ae45f4df58a6a8ea8a6400934d860cf5eb4 (diff) | |
| download | ceph-27fb44b358a15bd77f78c26c836d957a9a5654ad.tar.gz | |
make: build common/secret only on linuxautomake-fix-common
libkeyutils is only available on linux. before the automake refactoring
secret.c was compiled into rbd and ceph_mount targets which are linux
only targets. secret.c was moved to libcommon during the refactoring,
but the conditional compilation was lost.
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
| -rw-r--r-- | src/common/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 4c027909b4d..3526118205f 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -59,7 +59,6 @@ libcommon_la_SOURCES = \ common/pick_address.cc \ common/util.cc \ common/TextTable.cc \ - common/secret.c \ common/ceph_fs.cc \ common/ceph_hash.cc \ common/ceph_strings.cc \ @@ -67,6 +66,10 @@ libcommon_la_SOURCES = \ common/addr_parsing.c \ common/hobject.cc +if LINUX +libcommon_la_SOURCES += common/secret.c +endif + # these should go out of libcommon libcommon_la_SOURCES += \ mon/MonCap.cc \ |