librados: Stop bundling the now-unused headers.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index f5dcd534fc8cdd479ae53f06119aa8fd52f3ceab..4e964587ac1d1de4c72d5526232e00c3e50b66c2 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -206,11 +206,8 @@ fi
 %{_includedir}/rados/librados.h
 %{_includedir}/rados/librados.hpp
 %{_includedir}/rados/buffer.h
-%{_includedir}/rados/atomic.h
 %{_includedir}/rados/page.h
 %{_includedir}/rados/crc32c.h
-%{_includedir}/rados/Spinlock.h
-%{_includedir}/rados/assert.h
 %{_includedir}/rbd/librbd.h
 %{_includedir}/rbd/librbd.hpp
 %{_libdir}/libceph.so

diff --git a/debian/librados-dev.install b/debian/librados-dev.install
index 37c93ae450598de72f67b8fd49019fa16e94930f..b92d5e28519ff0ae37c9fb2cd8916f40afbb1d12 100644 (file)
--- a/debian/librados-dev.install
+++ b/debian/librados-dev.install
@@ -4,8 +4,5 @@ usr/lib/librados.la
 usr/include/rados/librados.h
 usr/include/rados/librados.hpp
 usr/include/rados/buffer.h
-usr/include/rados/atomic.h
 usr/include/rados/page.h
 usr/include/rados/crc32c.h
-usr/include/rados/Spinlock.h
-usr/include/rados/assert.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 2b8ca433ec95a7fc28ff97bf1e337d900da05174..f123f677bbb725b846a5e1694359ad476622ab20 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -529,11 +529,8 @@ rados_include_DATA = \
        $(srcdir)/include/rados/librados.h \
        $(srcdir)/include/rados/librados.hpp \
        $(srcdir)/include/buffer.h \
-       $(srcdir)/include/atomic.h \
        $(srcdir)/include/page.h \
-       $(srcdir)/include/crc32c.h \
-       $(srcdir)/include/Spinlock.h  \
-       $(srcdir)/include/assert.h
+       $(srcdir)/include/crc32c.h
 
 crush_includedir = $(includedir)/crush
 crush_include_DATA = \
@@ -847,7 +844,6 @@ noinst_HEADERS = \
         include/xlist.h\
        include/rados/librados.h\
        include/rados/librados.hpp\
-       include/rados/atomic.h\
        include/rados/page.h\
        include/rados/crc32c.h\
        include/rados/buffer.h\

diff --git a/src/include/rados/atomic.h b/src/include/rados/atomic.h
deleted file mode 120000 (symlink)
index e5822a1..0000000
--- a/src/include/rados/atomic.h
+++ /dev/null
@@ -1 +0,0 @@
-../atomic.h
\ No newline at end of file