From: Greg Farnum <gregf@hq.newdream.net>
Date: Thu, 9 Jul 2009 21:06:43 +0000 (-0700)
Subject: Merged Makefile.am
X-Git-Tag: v0.10~51
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0bd233424b4fe5cc73bed610bb5c691b5b7d0083;p=ceph.git

Merged Makefile.am
---

0bd233424b4fe5cc73bed610bb5c691b5b7d0083
diff --cc src/Makefile.am
index c51e41b92836,799c83592bb5..c9f2bec701a7
--- a/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_.*'