From: Ilya Dryomov <ilya.dryomov@inktank.com>
Date: Thu, 17 Apr 2014 15:03:24 +0000 (+0400)
Subject: Makefile: build common/secret.c with libtool
X-Git-Tag: v0.81~104^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=944dd1c62e8838e8bc67302b995f0a0839e5dc7b;p=ceph.git

Makefile: build common/secret.c with libtool

Turn common/secret.c into a libtool convenience library, libsecret.la.
Currently it is build directly, twice: for mount.ceph and rbd binaries.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
---

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index e1ba4a8bdbe07..e75b399b01b32 100644
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -131,6 +131,7 @@ endif # PROFILER
 
 LIBGLOBAL = libglobal.la
 LIBCOMMON = libcommon.la
+LIBSECRET = libsecret.la
 LIBARCH = libarch.la
 LIBPERFGLUE = libperfglue.la
 LIBAUTH = libauth.la
diff --git a/src/Makefile.am b/src/Makefile.am
index edec05e67ec80..aeda0ce329327 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,8 +54,8 @@ bin_PROGRAMS += ceph-mds
 
 # user tools
 
-mount_ceph_SOURCES = mount/mount.ceph.c common/secret.c
-mount_ceph_LDADD = $(LIBCOMMON) $(KEYUTILS_LIB)
+mount_ceph_SOURCES = mount/mount.ceph.c
+mount_ceph_LDADD = $(LIBSECRET) $(LIBCOMMON)
 if LINUX
 su_sbin_PROGRAMS += mount.ceph
 endif # LINUX
@@ -74,8 +74,8 @@ ceph_syn_SOURCES += client/SyntheticClient.cc # uses g_conf.. needs cleanup
 ceph_syn_LDADD = $(LIBCLIENT) $(CEPH_GLOBAL)
 bin_PROGRAMS += ceph-syn
 
-rbd_SOURCES = rbd.cc common/secret.c
-rbd_LDADD = $(LIBRBD) $(LIBRADOS) $(CEPH_GLOBAL) -lblkid $(KEYUTILS_LIB)
+rbd_SOURCES = rbd.cc
+rbd_LDADD = $(LIBSECRET) $(LIBRBD) $(LIBRADOS) $(CEPH_GLOBAL) -lblkid
 if LINUX
 bin_PROGRAMS += rbd
 endif #LINUX
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 9769e2ff6acda..ddeafb2057cc1 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -191,7 +191,6 @@ noinst_HEADERS += \
 	common/utf8.h \
 	common/mime.h \
 	common/pick_address.h \
-	common/secret.h \
 	common/strtol.h \
 	common/static_assert.h \
 	common/AsyncReserver.h \
@@ -203,3 +202,10 @@ noinst_HEADERS += \
 noinst_LTLIBRARIES += libcommon.la
 
 
+libsecret_la_SOURCES = common/secret.c
+libsecret_la_LIBADD = $(KEYUTILS_LIB)
+if LINUX
+noinst_LTLIBRARIES += libsecret.la
+endif
+
+noinst_HEADERS += common/secret.h