From: Yehuda Sadeh Date: Thu, 19 Apr 2012 23:44:59 +0000 (-0700) Subject: rados_bencher: fix build X-Git-Tag: v0.47~23^2~23 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a8eea853d2f4e58a29ccdba18aa9d16391fb7f4;p=ceph.git rados_bencher: fix build Signed-off-by: Yehuda Sadeh --- diff --git a/src/Makefile.am b/src/Makefile.am index 7cf36644e737..9a8d205e22d1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -285,8 +285,7 @@ librados_SOURCES = \ librados/librados.cc \ librados/RadosClient.cc \ librados/IoCtxImpl.cc \ - osdc/Objecter.cc \ - osdc/rados_bencher.cc + osdc/Objecter.cc librados_la_SOURCES = ${librados_SOURCES} librados_la_CFLAGS = ${CRYPTO_CFLAGS} ${AM_CFLAGS} librados_la_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS} @@ -319,7 +318,7 @@ librbd_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 \ -export-symbols-regex '^rbd_.*' $(PTHREAD_LIBS) $(EXTRALIBS) lib_LTLIBRARIES += librbd.la -rados_SOURCES = rados.cc rados_import.cc rados_export.cc rados_sync.cc +rados_SOURCES = rados.cc rados_import.cc rados_export.cc rados_sync.cc osdc/rados_bencher.cc rados_LDADD = libglobal.la librados.la $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) bin_PROGRAMS += rados diff --git a/src/osdc/rados_bencher.cc b/src/osdc/rados_bencher.cc index 7800cc99df66..6ee7eca566c3 100644 --- a/src/osdc/rados_bencher.cc +++ b/src/osdc/rados_bencher.cc @@ -15,10 +15,9 @@ * it will just loop forever. */ #include "include/rados/librados.hpp" -#include "common/config.h" -#include "global/global_init.h" #include "common/Cond.h" #include "rados_bencher.h" + #include #include