Merged Makefile.am

diff --cc src/Makefile.am
index c51e41b92836a389a039fbc1ca6536941f93f8c4,799c83592bb5bb83c29712db20974f3d904ec03b..c9f2bec701a7c0f1c7b66fcd803f8181c3f146ea
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -97,12 -97,10 +97,11 @@@ lib_LTLIBRARIES 
  # libceph
  libceph_la_SOURCES = \
        client/libceph.cc \
 +      client/Client.cc \
        msg/SimpleMessenger.cc \
        ${libcommon_a_SOURCES} \
 -      ${libosdc_a_SOURCES} \
 -      ${libclient_a_SOURCES}
 +      ${libcrush_a_SOURCES} \
 +      ${libosdc_a_SOURCES}
- 
  libceph_la_CFLAGS = ${AM_CFLAGS}
  libceph_la_CXXFLAGS= ${AM_CXXFLAGS}
  libceph_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex 'ceph_.*'