altered makefile, header includes

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

diff --git a/src/libtransport/Makefile b/src/libtransport/Makefile
index 9a5c0b5..d18b5d4 100644 (file)
--- a/src/libtransport/Makefile
+++ b/src/libtransport/Makefile
@@ -3,15 +3,12 @@
 
 CC = gcc
 LIB_DIR=../../lib
-CC_OPTS = -Wall -O2 -I /usr/include/libxml2 -I /usr/include/libxml2/libxml -I ../../include -I ../../../../cc/libxml2-2.6.16
-LD_OPTS = -lxml2
-EXE_LD_OPTS = -L $(LIB_DIR) -lxml2 -ltransport 
+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
 
 TARGETS=generic_utils.o transport_socket.o transport_message.o transport_session.o transport_client.o 
 
-all: router basic_client
-
 basic_client: lib
        $(CC) $(CC_OPTS) $(EXE_LD_OPTS) basic_client.c -o $@
 
@@ -19,13 +16,8 @@ basic_client: lib
        
 lib: 
        $(CC) -c $(CC_OPTS)     $(LIB_SOURCES)  
-       $(CC) -shared -W1 $(LD_OPTS) $(TARGETS) -o $(LIB_DIR)/libtransport.so
-
+       $(CC) -shared -W1 $(LD_OPTS) $(TARGETS) -o $(LIB_DIR)/libopensrf_transport.so
 
-# The router is compiled as a static binary because of some 
-# necessary #defines that would break the library
-router: 
-       $(CC) $(LD_OPTS) -D_ROUTER $(CC_OPTS)   $(LIB_SOURCES) transport_router.c -o $@ 
 
 clean:
-       /bin/rm -f *.o ../../lib/libtransport.so router basic_client
+       /bin/rm -f *.o $(LIB_DIR)/libopensrf_transport.so basic_client

diff --git a/src/libtransport/basic_client.c b/src/libtransport/basic_client.c
index 61cb9e6..c41b8af 100644 (file)
--- a/src/libtransport/basic_client.c
+++ b/src/libtransport/basic_client.c
@@ -1,7 +1,4 @@
-#include "transport_client.h"
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
+#include "opensrf/transport_client.h"
 
 /**
   * Simple jabber client
@@ -9,7 +6,6 @@
 
 
 
-
 /* connects and registers with the router */
 int main( int argc, char** argv ) {
 

diff --git a/src/libtransport/generic_utils.c b/src/libtransport/generic_utils.c
index ba0b284..d4b526d 100644 (file)
--- a/src/libtransport/generic_utils.c
+++ b/src/libtransport/generic_utils.c
@@ -1,4 +1,4 @@
-#include "generic_utils.h"
+#include "opensrf/generic_utils.h"
 #include <stdio.h>
 #include "pthread.h"
 

diff --git a/src/libtransport/transport_client.c b/src/libtransport/transport_client.c
index 40b2c36..223d47b 100644 (file)
--- a/src/libtransport/transport_client.c
+++ b/src/libtransport/transport_client.c
@@ -1,4 +1,4 @@
-#include "transport_client.h"
+#include "opensrf/transport_client.h"
 
 
 //int main( int argc, char** argv );

diff --git a/src/libtransport/transport_message.c b/src/libtransport/transport_message.c
index 78ebb1b..4809b89 100644 (file)
--- a/src/libtransport/transport_message.c
+++ b/src/libtransport/transport_message.c
@@ -1,4 +1,4 @@
-#include "transport_message.h"
+#include "opensrf/transport_message.h"
 
 
 // ---------------------------------------------------------------------------------

diff --git a/src/libtransport/transport_session.c b/src/libtransport/transport_session.c
index 71b0768..9acd507 100644 (file)
--- a/src/libtransport/transport_session.c
+++ b/src/libtransport/transport_session.c
@@ -1,4 +1,4 @@
-#include "transport_session.h"
+#include "opensrf/transport_session.h"
 
 
 

diff --git a/src/libtransport/transport_socket.c b/src/libtransport/transport_socket.c
index 6a9446c..e228f57 100644 (file)
--- a/src/libtransport/transport_socket.c
+++ b/src/libtransport/transport_socket.c
@@ -1,4 +1,4 @@
-#include "transport_socket.h"
+#include "opensrf/transport_socket.h"
 
 
 /*