moved sha.c

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

diff --git a/src/libtransport/Makefile b/src/libtransport/Makefile
index 2c81238..b2623b1 100644 (file)
--- a/src/libtransport/Makefile
+++ b/src/libtransport/Makefile
@@ -3,11 +3,12 @@
 
 CC = gcc
 LIB_DIR=../../lib
+UTIL_DIR = ../utils
 CC_OPTS = -fPIC -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 sha.c
+LIB_SOURCES = $(UTIL_DIR)/utils.c generic_utils.c transport_socket.c transport_session.c transport_message.c transport_client.c $(UTIL_DIR)/sha.c
 
-TARGETS=generic_utils.o transport_socket.o transport_message.o transport_session.o transport_client.o  sha.o
+TARGETS=utils.o generic_utils.o transport_socket.o transport_message.o transport_session.o transport_client.o  sha.o
 
 all: basic_client component
 

diff --git a/src/router/Makefile b/src/router/Makefile
index 6a1f242..9246800 100644 (file)
--- a/src/router/Makefile
+++ b/src/router/Makefile
@@ -3,9 +3,10 @@
 
 CC = gcc
 CC_OPTS = -Wall -O2 -I /usr/include/libxml2 -I /usr/include/libxml2/libxml -I ../../include
-LD_OPTS = -L ../../lib -lxml2 -lopensrf_stack -ljson
+LD_OPTS = -L ../../lib -lxml2 -lopensrf_stack -ljson -lobjson
 LP=../libtransport
-LIB_SOURCES = $(LP)/generic_utils.c $(LP)/transport_socket.c $(LP)/transport_session.c $(LP)/transport_message.c $(LP)/transport_client.c $(LP)/sha.c
+UTIL_DIR = ../utils
+LIB_SOURCES = $(UTIL_DIR)/utils.c $(LP)/generic_utils.c $(LP)/transport_socket.c $(LP)/transport_session.c $(LP)/transport_message.c $(LP)/transport_client.c $(UTIL_DIR)/sha.c
 
 all: router 
 install: router