removed the "libxml.h" dependency which is unnecessary (and requires source)

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

diff --git a/include/opensrf/transport_message.h b/include/opensrf/transport_message.h
index 69b0560..ab20f5d 100644 (file)
--- a/include/opensrf/transport_message.h
+++ b/include/opensrf/transport_message.h
@@ -1,5 +1,3 @@
-#include "libxml.h"
-
 #include "opensrf/generic_utils.h"
 
 #include <string.h>
@@ -44,6 +42,8 @@ typedef struct transport_message_struct transport_message;
 transport_message* message_init( char* body, char* subject, 
                char* thread, char* recipient, char* sender );
 
+transport_message* new_message_from_xml( const char* msg_xml );
+
 
 void message_set_router_info( transport_message* msg, char* router_from,
                char* router_to, char* router_class, char* router_command, int broadcast_enabled );

diff --git a/include/opensrf/transport_session.h b/include/opensrf/transport_session.h
index c2bef5d..6107106 100644 (file)
--- a/include/opensrf/transport_session.h
+++ b/include/opensrf/transport_session.h
@@ -3,7 +3,6 @@
 // a SAX push parser as it arrives.  When key Jabber documetn elements are met, 
 // logic ensues.
 // ---------------------------------------------------------------------------------
-#include "libxml.h"
 #include "opensrf/transport_socket.h"
 #include "opensrf/transport_message.h"
 #include "opensrf/generic_utils.h"

diff --git a/src/libtransport/Makefile b/src/libtransport/Makefile
index aa731ce..2ffd1b0 100644 (file)
--- a/src/libtransport/Makefile
+++ b/src/libtransport/Makefile
@@ -3,7 +3,7 @@
 
 CC = gcc
 LIB_DIR=../../lib
-CC_OPTS = -Wall -O2 -I /usr/include/libxml2 -I /usr/include/libxml2/libxml -I ../../include -I /home/erickson/cc/libxml2-2.6.16
+CC_OPTS = -Wall -O2 -I /usr/include/libxml2 -I /usr/include/libxml2/libxml -I ../../include #-I /home/erickson/cc/libxml2-2.6.16
 EXE_LD_OPTS = -L $(LIB_DIR) -lxml2 -lopensrf_transport 
 LIB_SOURCES = generic_utils.c transport_socket.c transport_session.c transport_message.c transport_client.c
 

diff --git a/src/router/Makefile b/src/router/Makefile
index 1cb0d0a..0317075 100644 (file)
--- a/src/router/Makefile
+++ b/src/router/Makefile
@@ -2,12 +2,15 @@
 #MALLOC_CHECK_=1 # XXX debug only
 
 CC = gcc
-CC_OPTS = -Wall -O2 -I /usr/include/libxml2 -I /usr/include/libxml2/libxml -I ../../include -I /home/erickson/cc/libxml2-2.6.16
+CC_OPTS = -Wall -O2 -I /usr/include/libxml2 -I /usr/include/libxml2/libxml -I ../../include
 LD_OPTS = -lxml2
 LP=../libtransport
 LIB_SOURCES = $(LP)/generic_utils.c $(LP)/transport_socket.c $(LP)/transport_session.c $(LP)/transport_message.c $(LP)/transport_client.c
 
-all: router
+all: router router_query
+
+router_query: router_query.c
+       $(CC) $(CC_OPTS) -L ../../lib -lopensrf_transport -lxml2 router_query.c -o router_query
 
 # The router is compiled as a static binary because of some 
 # necessary #defines that would break the library
@@ -15,4 +18,4 @@ router:
        $(CC) $(LD_OPTS) -D_ROUTER $(CC_OPTS)   $(LIB_SOURCES) router.c -o $@ 
 
 clean:
-       /bin/rm -f router 
+       /bin/rm -f router  router_query