altered makefile, header includes

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

diff --git a/src/router/Makefile b/src/router/Makefile
index 9a5c0b5..379a596 100644 (file)
--- a/src/router/Makefile
+++ b/src/router/Makefile
@@ -2,30 +2,15 @@
 #MALLOC_CHECK_=1 # XXX debug only
 
 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
+CC_OPTS = -Wall -O2 -I /usr/include/libxml2 -I /usr/include/libxml2/libxml -I ../../include -I /home/erickson/cc/libxml2-2.6.16
 LD_OPTS = -lxml2
-EXE_LD_OPTS = -L $(LIB_DIR) -lxml2 -ltransport 
-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 $@
-
-# --- Libs -----------------------------------------------
-       
-lib: 
-       $(CC) -c $(CC_OPTS)     $(LIB_SOURCES)  
-       $(CC) -shared -W1 $(LD_OPTS) $(TARGETS) -o $(LIB_DIR)/libtransport.so
-
+LP=../libtransport
+LIB_SOURCES = $(LP)/generic_utils.c $(LP)/transport_socket.c $(LP)/transport_session.c $(LP)/transport_message.c $(LP)/transport_client.c
 
 # 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 $@ 
+       $(CC) $(LD_OPTS) -D_ROUTER $(CC_OPTS)   $(LIB_SOURCES) router.c -o $@ 
 
 clean:
-       /bin/rm -f *.o ../../lib/libtransport.so router basic_client
+       /bin/rm -f router 

diff --git a/src/router/router.c b/src/router/router.c
index 24dbdbe..67944de 100644 (file)
--- a/src/router/router.c
+++ b/src/router/router.c
@@ -1,4 +1,4 @@
-#include "transport_router.h"
+#include "router.h"
 #include <sys/types.h>
 #include <signal.h>
 

diff --git a/src/router/router.h b/src/router/router.h
index 4cdbfbd..1f0ba00 100644 (file)
--- a/src/router/router.h
+++ b/src/router/router.h
@@ -1,10 +1,10 @@
-#include "transport_client.h"
-#include "transport_message.h"
+#include "opensrf/transport_client.h"
+#include "opensrf/transport_message.h"
 #include <time.h>
 #include <sys/select.h>
 
-#ifndef TRANSPORT_ROUTER_H
-#define TRANSPORT_ROUTER_H
+#ifndef ROUTER_H
+#define ROUTER_H
 
 // ----------------------------------------------------------------------
 // Jabber router_registrar/load balancer.  There is a top level linked list of