Move ceph-dencoder build to client

The patch simply moves the ceph-dencoder build from server part of the
Makefiles to client part of the Makefiles.

Refs: #10691

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit ef2164725f0b55ffa4b609d407eed5f3f3048b46)

diff --git a/src/test/Makefile-client.am b/src/test/Makefile-client.am
index 824783b9b12a8e1a9c78c76f585741588b65cffd..e83a13107b996f5f61a2b0ac8a08d729df709b31 100644 (file)
--- a/src/test/Makefile-client.am
+++ b/src/test/Makefile-client.am
@@ -1,3 +1,27 @@
+# This should use LIBMDS_TYPES once it exists
+ceph_dencoder_SOURCES = \
+       test/encoding/ceph_dencoder.cc \
+       $(DENCODER_SOURCES)
+ceph_dencoder_LDADD = \
+       $(LIBRBD_TYPES) \
+       $(LIBOSD_TYPES) \
+       $(LIBOS_TYPES) \
+       $(LIBMON_TYPES) \
+       $(DENCODER_DEPS) \
+       $(CEPH_GLOBAL)
+
+# These should always use explicit _CFLAGS/_CXXFLAGS so avoid basename conflicts
+ceph_dencoder_CFLAGS = ${AM_CFLAGS}
+ceph_dencoder_CXXFLAGS = ${AM_CXXFLAGS}
+
+if COMPILER_HAS_VTA
+ceph_dencoder_CFLAGS += -fno-var-tracking-assignments
+ceph_dencoder_CXXFLAGS += -fno-var-tracking-assignments
+endif
+
+bin_PROGRAMS += ceph-dencoder
+
+
 if WITH_RADOS
 
 libradostest_la_SOURCES = \

diff --git a/src/test/Makefile-server.am b/src/test/Makefile-server.am
index 95ed80cd83cfb23405d95f9492c53bacc9a963c1..c8229632f4c60f0a296eb2cf5f1dfe5e5f45c58f 100644 (file)
--- a/src/test/Makefile-server.am
+++ b/src/test/Makefile-server.am
@@ -202,30 +202,6 @@ check_PROGRAMS += unittest_lfnindex
 
 if WITH_MDS
 
-# This should go to client once LIBMDS_TYPES exists
-ceph_dencoder_SOURCES = \
-       test/encoding/ceph_dencoder.cc \
-       $(DENCODER_SOURCES)
-ceph_dencoder_LDADD = \
-       $(LIBRBD_TYPES) \
-       $(LIBOSD_TYPES) \
-       $(LIBOS_TYPES) \
-       $(LIBMDS) \
-       $(LIBMON_TYPES) \
-       $(DENCODER_DEPS) \
-       $(CEPH_GLOBAL)
-
-# These should always use explicit _CFLAGS/_CXXFLAGS so avoid basename conflicts
-ceph_dencoder_CFLAGS = ${AM_CFLAGS}
-ceph_dencoder_CXXFLAGS = ${AM_CXXFLAGS}
-
-if COMPILER_HAS_VTA
-ceph_dencoder_CFLAGS += -fno-var-tracking-assignments
-ceph_dencoder_CXXFLAGS += -fno-var-tracking-assignments
-endif
-
-bin_PROGRAMS += ceph-dencoder
-
 unittest_mds_authcap_SOURCES = test/mds/TestMDSAuthCaps.cc 
 unittest_mds_authcap_LDADD = $(LIBMDS) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
 unittest_mds_authcap_CXXFLAGS = $(UNITTEST_CXXFLAGS)