From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Fri, 7 Aug 2009 15:50:05 +0000 (-0700)
Subject: Merge commit 'origin/unstable' into rados
X-Git-Tag: v0.13~123
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1fb90d367dc9141a6a87da412c9634406e469ff8;p=ceph.git

Merge commit 'origin/unstable' into rados

Conflicts:

	src/Makefile.am
---

1fb90d367dc9141a6a87da412c9634406e469ff8
diff --cc src/Makefile.am
index 050b8363415f,0dfbac719792..0dbf399abb98
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -132,22 -130,9 +130,23 @@@ librados_la_CXXFLAGS = ${AM_CXXFLAGS
  librados_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex 'rados_.*'
  lib_LTLIBRARIES += librados.la
  
 +if WITH_S3GW
 +libcephs3_la_SOURCES = \
 +	s3/s3fs.cc \
 +	s3/s3rados.cc \
 +	s3/s3acl.cc \
 +	s3/s3user.cc \
 +	s3/s3access.cc \
 +	s3/s3op.cc \
 +	s3/s3rest.cc \
 +	s3/s3common.cc
 +libcephs3_la_CFLAGS = ${AM_CFLAGS}
 +lib_LTLIBRARIES += libcephs3.la
 +endif
 +
  rados_SOURCES = rados.cc
  rados_LDADD = librados.la libcrush.la
+ bin_PROGRAMS += rados
  
  testrados_SOURCES = testrados.c
  testrados_LDADD = librados.la libcrush.la
@@@ -155,16 -140,12 +154,16 @@@ testradospp_SOURCES = testradospp.c
  testradospp_LDADD = librados.la libcrush.la
  radosacl_SOURCES = radosacl.cc
  radosacl_LDADD = librados.la libcrush.la
+ bin_PROGRAMS += testrados testradospp radosacl
  
  if WITH_S3GW
 -s3gw_SOURCES = s3/s3gw.cc s3/s3fs.cc
 -s3gw_LDADD = librados.la libcrush.la -lfcgi
 -bin_PROGRAMS += s3gw
 +s3gw_SOURCES = s3/s3gw.cc
 +s3gw_LDADD = libcephs3.la librados.la libcrush.la -lfcgi -lcrypto -lexpat
 +s3admin_SOURCES = s3/s3admin.cc
 +s3admin_LDADD = libcephs3.la librados.la libcrush.la -lfcgi -lcrypto -lexpat
 +s3aclparser_SOURCES = s3/s3aclparser.cc
 +s3aclparser_LDADD = libcephs3.la librados.la libcrush.la -lfcgi -lcrypto -lexpat
- s3log_SOURCES = s3/s3log.cc
- s3log_LDADD = libcephs3.la librados.la libcrush.la -lfcgi -lcrypto -lexpat
++bin_PROGRAMS += s3gw s3admin s3aclparser
  endif
  
  ## object classes