RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 01:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move ceph-dencoder build to client

Browse Source 
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>
This commit is contained in:
Boris Ranto 2015-04-13 12:38:58 +02:00
parent c2b3a35fb3
commit ef2164725f
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/test/Makefile-client.am
View File

@ -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 = \

24
src/test/Makefile-server.am
View File

@ -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)