From d3e0db474c2ab5f6ec8c6d91d72d56cd399a90d2 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 12 Apr 2018 11:58:15 +0800 Subject: [PATCH] mds: change libmon to .la archive before this change, it is a plain .a archive. because MDSAuthCaps.cc is included by both libmon.a and libmds.la, automake complains that src/Makefile.am: error: object 'mds/MDSAuthCaps.$(OBJEXT)' created both with libtool and without so we need to consolidate them. as most of the convenience libraries are are created using libtool. to be more consistent, i am chaning libmon.a to libmon.la. Signed-off-by: Kefu Chai Conflicts: src/Makefile-env.am src/mds/Makefile-server.am: this change is not cherry-picked from master. as we switched from autotools to cmake since luminous. --- src/Makefile-env.am | 2 +- src/mon/Makefile.am | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile-env.am b/src/Makefile-env.am index 4771bad02d6f2..c744c487428e7 100644 --- a/src/Makefile-env.am +++ b/src/Makefile-env.am @@ -210,7 +210,7 @@ LIBOS_TYPES = libos_types.a LIBOSD = libosd.a LIBOSD_TYPES = libosd_types.la LIBOSDC = libosdc.la -LIBMON = libmon.a +LIBMON = libmon.la LIBMON_TYPES = libmon_types.la LIBMDS = libmds.la LIBCLIENT = libclient.la diff --git a/src/mon/Makefile.am b/src/mon/Makefile.am index e864fb213f70b..524742edcfbc6 100644 --- a/src/mon/Makefile.am +++ b/src/mon/Makefile.am @@ -5,7 +5,7 @@ noinst_LTLIBRARIES += libmon_types.la if ENABLE_SERVER if WITH_MON -libmon_a_SOURCES = \ +libmon_la_SOURCES = \ mon/Monitor.cc \ mon/Paxos.cc \ mon/PaxosService.cc \ @@ -21,8 +21,8 @@ libmon_a_SOURCES = \ mon/ConfigKeyService.cc \ mds/MDSAuthCaps.cc \ osd/OSDCap.cc -libmon_a_LIBADD = -noinst_LIBRARIES += libmon.a +libmon_la_LIBADD = +noinst_LTLIBRARIES += libmon.la noinst_HEADERS += \ mon/AuthMonitor.h \ -- 2.39.5