all opensrf related headers are shoved into opensrf/*.h

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@516 9efc2488-bf62-4759-914b-345cdb29e865

diff --git a/src/gateway/fieldmapper-c-xml-out.pl b/src/gateway/fieldmapper-c-xml-out.pl
index fa5829c..857a3fc 100755 (executable)
--- a/src/gateway/fieldmapper-c-xml-out.pl
+++ b/src/gateway/fieldmapper-c-xml-out.pl
@@ -44,7 +44,7 @@ print SOURCE <<C;
 #include <stdio.h>
 #include "objson/object.h"
 #include "objson/json_parser.h"
-#include "utils.h"
+#include "opensrf/utils.h"
 
 char* json_string_to_xml(char*);
 void _rest_xml_output(growing_buffer*, object*, char*, int, int);

diff --git a/src/jserver/jserver-c.h b/src/jserver/jserver-c.h
index d215a12..498df0a 100644 (file)
--- a/src/jserver/jserver-c.h
+++ b/src/jserver/jserver-c.h
@@ -1,6 +1,6 @@
-#include "utils.h"
-#include "logging.h"
-#include "socket_bundle.h"
+#include "opensrf/utils.h"
+#include "opensrf/logging.h"
+#include "opensrf/socket_bundle.h"
 #include "jserver-c_session.h"
 #include "jstrings.h"
 

diff --git a/src/jserver/jserver-c_session.h b/src/jserver/jserver-c_session.h
index d90b048..d8e7229 100644 (file)
--- a/src/jserver/jserver-c_session.h
+++ b/src/jserver/jserver-c_session.h
@@ -1,7 +1,7 @@
 #define _GNU_SOURCE
 
-#include "utils.h"
-#include "logging.h"
+#include "opensrf/utils.h"
+#include "opensrf/logging.h"
 
 #include "jstrings.h"
 

diff --git a/src/libstack/osrfConfig.h b/src/libstack/osrfConfig.h
index 0d184fe..c0a6459 100644 (file)
--- a/src/libstack/osrfConfig.h
+++ b/src/libstack/osrfConfig.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
 #define _OSRF_CONFIG_H
 
 #include "xml_utils.h"
-#include "utils.h"
-#include "string_array.h"
+#include "opensrf/utils.h"
+#include "opensrf/string_array.h"
 #include "objson/object.h"
 
 typedef struct {

diff --git a/src/libstack/osrf_app_session.h b/src/libstack/osrf_app_session.h
index 6d8626b..50d283a 100644 (file)
--- a/src/libstack/osrf_app_session.h
+++ b/src/libstack/osrf_app_session.h
@@ -4,8 +4,7 @@
 #include "opensrf/transport_client.h"
 #include "osrf_message.h"
 #include "osrf_system.h"
-#include "string_array.h"
-//#include "osrf_config.h"
+#include "opensrf/string_array.h"
 #include "osrfConfig.h"
 
 #include "objson/object.h"

diff --git a/src/libstack/osrf_message.h b/src/libstack/osrf_message.h
index 637c8b1..42df49a 100644 (file)
--- a/src/libstack/osrf_message.h
+++ b/src/libstack/osrf_message.h
@@ -1,6 +1,6 @@
-#include "string_array.h"
-#include "utils.h"
-#include "logging.h"
+#include "opensrf/string_array.h"
+#include "opensrf/utils.h"
+#include "opensrf/logging.h"
 #include "objson/object.h"
 #include "objson/json_parser.h"
 

diff --git a/src/libstack/osrf_prefork.h b/src/libstack/osrf_prefork.h
index c1c35de..a2dfdb8 100644 (file)
--- a/src/libstack/osrf_prefork.h
+++ b/src/libstack/osrf_prefork.h
@@ -7,7 +7,7 @@
 #include <sys/select.h>
 #include <sys/wait.h>
 
-#include "utils.h"
+#include "opensrf/utils.h"
 #include "opensrf/transport_message.h"
 #include "osrf_stack.h"
 #include "osrf_settings.h"

diff --git a/src/libstack/osrf_settings.h b/src/libstack/osrf_settings.h
index f8d5d31..7241b49 100644 (file)
--- a/src/libstack/osrf_settings.h
+++ b/src/libstack/osrf_settings.h
@@ -8,8 +8,8 @@
 #include <time.h>
 #include <stdarg.h>
 
-#include "logging.h"
-#include "utils.h"
+#include "opensrf/logging.h"
+#include "opensrf/utils.h"
 #include "objson/object.h"
 #include "objson/json_parser.h"
 #include "osrf_app_session.h"

diff --git a/src/libstack/osrf_system.h b/src/libstack/osrf_system.h
index 0b9b262..414b7d3 100644 (file)
--- a/src/libstack/osrf_system.h
+++ b/src/libstack/osrf_system.h
@@ -2,9 +2,8 @@
 #define OSRF_SYSTEM_H
 
 #include "opensrf/transport_client.h"
-#include "utils.h"
-#include "logging.h"
-//#include "osrf_config.h"
+#include "opensrf/utils.h"
+#include "opensrf/logging.h"
 #include "osrf_settings.h"
 #include "osrfConfig.h"
 

diff --git a/src/libtransport/transport_client.h b/src/libtransport/transport_client.h
index 318d3bf..530285d 100644 (file)
--- a/src/libtransport/transport_client.h
+++ b/src/libtransport/transport_client.h
@@ -1,6 +1,6 @@
 #include "transport_session.h"
-#include "utils.h"
-#include "logging.h"
+#include "opensrf/utils.h"
+#include "opensrf/logging.h"
 
 #include <time.h>
 

diff --git a/src/libtransport/transport_message.h b/src/libtransport/transport_message.h
index a0dc7ff..6cc485b 100644 (file)
--- a/src/libtransport/transport_message.h
+++ b/src/libtransport/transport_message.h
@@ -6,8 +6,8 @@
 #include <libxml/debugXML.h>
 #include <libxml/xmlmemory.h>
 
-#include "utils.h"
-#include "logging.h"
+#include "opensrf/utils.h"
+#include "opensrf/logging.h"
 
 #ifndef TRANSPORT_MESSAGE_H
 #define TRANSPORT_MESSAGE_H

diff --git a/src/libtransport/transport_session.h b/src/libtransport/transport_session.h
index 27199e8..9701cbe 100644 (file)
--- a/src/libtransport/transport_session.h
+++ b/src/libtransport/transport_session.h
@@ -5,9 +5,9 @@
 // ---------------------------------------------------------------------------------
 #include "transport_message.h"
 
-#include "utils.h"
-#include "logging.h"
-#include "socket_bundle.h"
+#include "opensrf/utils.h"
+#include "opensrf/logging.h"
+#include "opensrf/socket_bundle.h"
 
 #include "sha.h"
 

diff --git a/src/objson/json_parser.h b/src/objson/json_parser.h
index e47a429..6beec62 100644 (file)
--- a/src/objson/json_parser.h
+++ b/src/objson/json_parser.h
@@ -24,7 +24,7 @@ GNU General Public License for more details.
 
 #include <stdio.h>
 #include "object.h"
-#include "utils.h"
+#include "opensrf/utils.h"
 
 
 

diff --git a/src/objson/object.h b/src/objson/object.h
index 64168b9..41a2ccf 100644 (file)
--- a/src/objson/object.h
+++ b/src/objson/object.h
@@ -26,7 +26,7 @@ GNU General Public License for more details.
 #include <stdlib.h>
 #include <string.h>
 
-#include "utils.h"
+#include "opensrf/utils.h"
 
 /* json object types */
 #define JSON_HASH      0

diff --git a/src/router/router.h b/src/router/router.h
index f123396..8690835 100644 (file)
--- a/src/router/router.h
+++ b/src/router/router.h
@@ -2,9 +2,9 @@
 #include "opensrf/transport_message.h"
 #include "opensrf/osrf_message.h"
 
-#include "utils.h"
-#include "logging.h"
-#include "osrfConfig.h"
+#include "opensrf/utils.h"
+#include "opensrf/logging.h"
+#include "opensrf/osrfConfig.h"
 
 #include <time.h>
 #include <sys/select.h>

diff --git a/src/utils/Makefile b/src/utils/Makefile
index f0e4c28..4433364 100644 (file)
--- a/src/utils/Makefile
+++ b/src/utils/Makefile
@@ -16,8 +16,8 @@ msg:
 
 install: 
        echo installing libc_utils.so
-       cp $(UTIL_HEADERS) $(INCLUDEDIR)/
-       cp xml_utils.h $(INCLUDEDIR)/
+       cp $(UTIL_HEADERS) $(INCLUDEDIR)/$(OPENSRF)/
+       cp xml_utils.h $(INCLUDEDIR)/$(OPENSRF)/
        cp $(TMPDIR)/libc_utils.so $(LIBDIR)/
 
 libc_utils.so: $(UTIL_OBJECTS)