Makefile: use libclient.la for libcephfs

Avoid building these files twice!

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index e1875256d271a8aca6a02f5363cdd38072219cfa..46bbc66ca24eb209480fe7ba1080a34383945b8d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -144,7 +144,7 @@ bin_PROGRAMS += librados-config
 
 # synthetic client
 ceph_syn_SOURCES = ceph_syn.cc client/SyntheticClient.cc
-ceph_syn_LDADD = libclient.la libosdc.la $(LIBGLOBAL_LDA)
+ceph_syn_LDADD = libclient.la $(LIBGLOBAL_LDA)
 bin_PROGRAMS += ceph-syn
 
 base: ceph-mon ceph-osd ceph-mds \
@@ -158,7 +158,7 @@ base: ceph-mon ceph-osd ceph-mds \
 # fuse targets?
 if WITH_FUSE
 ceph_fuse_SOURCES = ceph_fuse.cc client/fuse_ll.cc
-ceph_fuse_LDADD = -lfuse libclient.la libosdc.la $(LIBGLOBAL_LDA)
+ceph_fuse_LDADD = -lfuse libclient.la $(LIBGLOBAL_LDA)
 ceph_fuse_CXXFLAGS = ${AM_CXXFLAGS}
 bin_PROGRAMS += ceph-fuse
 
@@ -288,13 +288,10 @@ noinst_LIBRARIES =
 
 # libcephfs
 libcephfs_la_SOURCES = \
-       libcephfs.cc \
-       client/Client.cc \
-       client/Inode.cc \
-       client/MetaRequest.cc
+       libcephfs.cc
 libcephfs_la_CFLAGS= ${CRYPTO_CFLAGS} ${AM_CFLAGS}
 libcephfs_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
-libcephfs_la_LIBADD = libosdc.la
+libcephfs_la_LIBADD = libclient.la
 libcephfs_la_LDFLAGS =  $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) \
             ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '^ceph_.*'
 lib_LTLIBRARIES += libcephfs.la

diff --git a/src/client/Trace.cc b/src/client/Trace.cc
index 20d4ce0dfc79be52f9d3a58f406c510ee7580aa9..f718595d00e66e52b69aa761662316bcddecbb38 100644 (file)
--- a/src/client/Trace.cc
+++ b/src/client/Trace.cc
@@ -42,10 +42,10 @@ void Trace::start()
   fs = new ifstream();
   fs->open(filename);
   if (!fs->is_open()) {
-    generic_dout(0) << "** unable to open trace file " << filename << dendl;
+    //generic_dout(0) << "** unable to open trace file " << filename << dendl;
     assert(0);
   }
-  generic_dout(2) << "opened traced file '" << filename << "'" << dendl;
+  //generic_dout(2) << "opened traced file '" << filename << "'" << dendl;
   
   // read first line
   getline(*fs, line);