From c9cb11833031b6fabe367d650a3292495c2f54df Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 8 Apr 2010 09:54:18 -0700
Subject: [PATCH] librados: move librados.h to include/

---
 src/Makefile.am                  | 4 ++--
 src/{osdc => include}/librados.h | 0
 src/librados.cc                  | 2 +-
 src/osdc/rados_bencher.h         | 2 +-
 src/rados.cc                     | 2 +-
 src/radosacl.cc                  | 2 +-
 src/rbdtool.cc                   | 2 +-
 src/rgw/rgw_rados.cc             | 2 +-
 src/rgw/rgw_rados.h              | 2 +-
 src/testrados.c                  | 2 +-
 src/testradospp.cc               | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename src/{osdc => include}/librados.h (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index bc4e393fee6d6..8c014615395ea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -272,7 +272,7 @@ install-data-local:
 	mkdir -p $(DESTDIR)$(includedir)/ceph
 	$(install_sh_SCRIPT) -m 0644 client/libceph.h $(DESTDIR)$(includedir)/ceph/libceph.h
 	mkdir -p $(DESTDIR)$(includedir)/rados
-	$(install_sh_SCRIPT) -m 0644 osdc/librados.h $(DESTDIR)$(includedir)/rados/librados.h
+	$(install_sh_SCRIPT) -m 0644 include/librados.h $(DESTDIR)$(includedir)/rados/librados.h
 	mkdir -p $(DESTDIR)$(includedir)/crush
 	$(install_sh_SCRIPT) -m 0644 crush/hash.h $(DESTDIR)$(includedir)/crush/hash.h
 	$(install_sh_SCRIPT) -m 0644 crush/crush.h $(DESTDIR)$(includedir)/crush/crush.h
@@ -517,6 +517,7 @@ noinst_HEADERS = \
         include/intarith.h\
         include/interval_set.h\
         include/inttypes.h\
+	include/librados.h\
         include/lru.h\
 	include/msgr.h\
         include/nstring.h\
@@ -722,7 +723,6 @@ noinst_HEADERS = \
         osd/RAID4PG.h\
         osd/ReplicatedPG.h\
         osd/osd_types.h\
-	osdc/librados.h\
 	osdc/rados_bencher.h\
         osdc/Blinker.h\
         osdc/Filer.h\
diff --git a/src/osdc/librados.h b/src/include/librados.h
similarity index 100%
rename from src/osdc/librados.h
rename to src/include/librados.h
diff --git a/src/librados.cc b/src/librados.cc
index e7f4cdc911ee8..4474614a9c0a1 100644
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -37,7 +37,7 @@ using namespace std;
 
 #include "osdc/Objecter.h"
 
-#include "osdc/librados.h"
+#include "include/librados.h"
 
 #define RADOS_LIST_MAX_ENTRIES 1024
 #define DOUT_SUBSYS rados
diff --git a/src/osdc/rados_bencher.h b/src/osdc/rados_bencher.h
index fbbf2bafefa6c..56e215df8e86b 100644
--- a/src/osdc/rados_bencher.h
+++ b/src/osdc/rados_bencher.h
@@ -14,7 +14,7 @@
  * try and bench on a pool you don't have permission to access
  * it will just loop forever.
  */
-#include "osdc/librados.h"
+#include "include/librados.h"
 #include "config.h"
 #include "common/common_init.h"
 #include "common/Cond.h"
diff --git a/src/rados.cc b/src/rados.cc
index cee521519959a..fef6c7cb498c6 100644
--- a/src/rados.cc
+++ b/src/rados.cc
@@ -14,7 +14,7 @@
 
 #include "include/types.h"
 #include "osdc/rados_bencher.h"
-#include "osdc/librados.h"
+#include "include/librados.h"
 
 #include "config.h"
 #include "common/common_init.h"
diff --git a/src/radosacl.cc b/src/radosacl.cc
index 92c2cf264548b..5d5dc710a5a22 100644
--- a/src/radosacl.cc
+++ b/src/radosacl.cc
@@ -13,7 +13,7 @@
  */
 
 #include "include/types.h"
-#include "osdc/librados.h"
+#include "include/librados.h"
 
 #include <iostream>
 
diff --git a/src/rbdtool.cc b/src/rbdtool.cc
index fa39eaee140f3..26e6ab4adab3b 100644
--- a/src/rbdtool.cc
+++ b/src/rbdtool.cc
@@ -15,7 +15,7 @@
 #include "config.h"
 
 #include "common/common_init.h"
-#include "osdc/librados.h"
+#include "include/librados.h"
 #include "include/byteorder.h"
 
 
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index fb62e6b83bb7e..95dde4aa64d6c 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -4,7 +4,7 @@
 #include "rgw_access.h"
 #include "rgw_rados.h"
 
-#include "osdc/librados.h"
+#include "include/librados.h"
 
 #include <string>
 #include <iostream>
diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index d490558525433..e8eb67cfed07e 100644
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -1,7 +1,7 @@
 #ifndef __RGWRADOS_H
 #define __RGWRADOS_H
 
-#include "osdc/librados.h"
+#include "include/librados.h"
 #include "rgw_access.h"
 
 
diff --git a/src/testrados.c b/src/testrados.c
index 9db257e538207..6bc58c8f7e46e 100644
--- a/src/testrados.c
+++ b/src/testrados.c
@@ -12,7 +12,7 @@
  * 
  */
 
-#include "osdc/librados.h"
+#include "include/librados.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/testradospp.cc b/src/testradospp.cc
index be73d6c4540d8..e774f3ef452b8 100644
--- a/src/testradospp.cc
+++ b/src/testradospp.cc
@@ -13,7 +13,7 @@
  */
 
 #include "include/types.h"
-#include "osdc/librados.h"
+#include "include/librados.h"
 
 #include <iostream>
 
-- 
2.39.5