cclass: $libdir/rados-classes

diff --git a/src/Makefile.am b/src/Makefile.am
index d1149e6099da216c69c05c417aed5942fb638b05..ab92c03dc6fb594c85f8f092350752fc5512f53d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -202,35 +202,25 @@ bin_PROGRAMS += testkeys
 endif
 
 
-## object classes
-
-# libtestclass.so: testclass.cc
-#      ${CXX} -fPIC -shared -g -o libtestclass.so testclass.cc
-# libbarclass.so: barclass.cc
-#      ${CXX} -fPIC -shared -g -o libbarclass.so barclass.cc
-# libfooclass.so: fooclass.cc
-#      ${CXX} -fPIC -shared -g -o libfooclass.so fooclass.cc
-# 
-#BUILT_SOURCES += libtestclass.so libfooclass.so libbarclass.so
-
-libcls_crypto.so: cls_crypto.cc
-       ${CXX} -I. -fPIC -shared -g -o libcls_crypto.so -lcrypto cls_crypto.cc
-BUILT_SOURCES += libcls_crypto.so
-
-libcls_acl.so: cls_acl.cc
-       ${CXX} -I. -fPIC -shared -g -o libcls_acl.so cls_acl.cc
-BUILT_SOURCES += libcls_acl.so
-
-# libcls_rbd.so: cls_rbd.cc
-#      ${CXX} -I. -fPIC -shared -g -o libcls_rbd.so cls_rbd.cc
-# BUILT_SOURCES += libcls_rbd.so
+## rados object classes
+
+#libcls_crypto.so: cls_crypto.cc
+#      ${CXX} -I. -fPIC -shared -g -o libcls_crypto.so -lcrypto cls_crypto.cc
+#BUILT_SOURCES += libcls_crypto.so
+
+#libcls_acl.so: cls_acl.cc
+#      ${CXX} -I. -fPIC -shared -g -o libcls_acl.so cls_acl.cc
+#BUILT_SOURCES += libcls_acl.so
+
+# rbd: rados block device class
 libcls_rbd_la_SOURCES = \
        cls_rbd.cc
 libcls_rbd_la_CFLAGS = ${AM_CFLAGS}
 libcls_rbd_la_CXXFLAGS= ${AM_CXXFLAGS}
-# libcls_rbd_LIBADD =
 libcls_rbd_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '.*__cls_.*' -lpthread
-lib_LTLIBRARIES += libcls_rbd.la
+
+radoslibdir = $(libdir)/rados-classes
+radoslib_LTLIBRARIES = libcls_rbd.la
 
 
 ## hadoop client

diff --git a/src/cclass.in b/src/cclass.in
index 8850bf2d6e332cfc9be6a2b2f2dc555b4552612c..6f101c53ddcbd8a2ecb528f0a164c5d92d712325 100755 (executable)
--- a/src/cclass.in
+++ b/src/cclass.in
@@ -43,11 +43,13 @@ err_exit() {
        exit 1
 }
 
+libdir="$LIBDIR/rados-classes"
+
 while [ $# -ge 1 ]; do
 case $1 in
     -L | --libdir )
            shift
-            LIBDIR=$1
+            libdir=$1
            ;;
     -l | --load )
            load=1
@@ -83,7 +85,7 @@ load() {
 }
 
 load_all() {
-       all=`find $LIBDIR -name 'libcls_*.so'`;
+       all=`find $libdir -name 'libcls_*.so'`;
        if [ -n "$all" ]; then
                for fn in $all; do
                        echo Loading class: $fn: `$BINDIR/cclsinfo $fn`

diff --git a/src/vstart.sh b/src/vstart.sh
index 3cf12378279e70f11296298e2a615d38179052c9..7250f422378d96ba76de15d9a5b87510f3d8f4a8 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -320,7 +320,7 @@ EOF
        fi
 
        # load classes
-       $CEPH_BIN/cclass -c $conf -a
+       $CEPH_BIN/cclass -c $conf -a -L .libs
 fi
 
 #osd