From 1a97d47b4f96ad00f06fdeb616a19fc51defbe15 Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 18 Jan 2007 19:30:34 +0000
Subject: [PATCH] removed libjudy dependencies from makefiles

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_0@6786 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 OpenSRF/src/Makefile          | 13 ++++---------
 OpenSRF/src/libstack/Makefile | 12 ++++--------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/OpenSRF/src/Makefile b/OpenSRF/src/Makefile
index 7e2cefce35..1955932e15 100644
--- a/OpenSRF/src/Makefile
+++ b/OpenSRF/src/Makefile
@@ -31,15 +31,13 @@ OPENSRF_TARGETS = 	libtransport/transport_session.o \
 			libstack/xml_utils.o \
 			libstack/osrf_transgroup.o \
 			libstack/osrf_list.o \
-			libstack/osrf_big_list.o \
 			libstack/osrf_hash.o \
-			libstack/osrf_big_hash.o \
 			utils/socket_bundle.o \
 			utils/string_array.o \
 			utils/utils.o \
 			utils/log.o \
 			utils/md5.o \
-			utils/sha.o \
+			utils/sha.o 
 
 OPENSRF_HEADERS = 	libtransport/transport_session.h \
 			libtransport/transport_client.h \
@@ -56,16 +54,13 @@ OPENSRF_HEADERS = 	libtransport/transport_session.h \
 			libstack/xml_utils.h \
 			libstack/osrf_transgroup.h \
 			libstack/osrf_list.h \
-			libstack/osrf_big_list.h \
 			libstack/osrf_hash.h \
-			libstack/osrf_big_hash.h \
 			utils/socket_bundle.h \
 			utils/string_array.h \
 			utils/utils.h \
 			utils/log.h \
 			utils/md5.h \
-			utils/sha.h \
-
+			utils/sha.h 
 
 all: 	prep \
 	libopensrf.so \
@@ -95,7 +90,7 @@ libopensrf.so:	objson/libobjson.so
 	@echo stack
 	make -C libstack
 	@echo $@
-	$(CC) -shared -W1 $(LDFLAGS) -lJudy -lxml2 -lmemcache -lobjson $(OPENSRF_TARGETS) -o $(TMPDIR)/$(LIBOPENSRF)
+	$(CC) -shared -W1 $(LDFLAGS) -lxml2 -lmemcache -lobjson $(OPENSRF_TARGETS) -o $(TMPDIR)/$(LIBOPENSRF)
 	@echo apps
 	make -C  c-apps
 
@@ -118,7 +113,7 @@ objson/libobjson.so:	prep
 libstack/opensrf.o:	libstack/opensrf.c libopensrf.so
 libstack/opensrf:	libstack/opensrf.o
 	@echo $@
-	$(CC) $(CFLAGS) $(LDFLAGS) -lJudy -lxml2 -lopensrf -lobjson libstack/opensrf.o -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) -lxml2 -lopensrf -lobjson libstack/opensrf.o -o $@
 	
 
 router: libopensrf.so
diff --git a/OpenSRF/src/libstack/Makefile b/OpenSRF/src/libstack/Makefile
index 1de68e4c02..82fae9a345 100644
--- a/OpenSRF/src/libstack/Makefile
+++ b/OpenSRF/src/libstack/Makefile
@@ -3,7 +3,7 @@
 #	provided to any method is not at least as large as the 'argc' setting for the method
 
 CFLAGS	+=  -DASSUME_STATELESS  -DOSRF_LOG_PARAMS -DOSRF_STRICT_PARAMS -rdynamic -fno-strict-aliasing
-LDLIBS	+= -lxml2 -lobjson -ldl -lmemcache -LJudy
+LDLIBS	+= -lxml2 -lobjson -ldl -lmemcache 
 
 TARGETS = osrf_message.o \
 			 osrf_app_session.o \
@@ -16,10 +16,8 @@ TARGETS = osrf_message.o \
 			 osrf_cache.o \
 			 osrf_transgroup.o \
 			 osrf_list.o \
-			 osrf_big_list.o \
 			 osrf_hash.o \
-			 osrf_big_hash.o \
-			 xml_utils.o
+			 xml_utils.o 
 
 HEADERS = osrf_message.h \
 			 osrf_app_session.h \
@@ -32,9 +30,7 @@ HEADERS = osrf_message.h \
 			 osrf_cache.h \
 			 osrf_transgroup.h \
 			 osrf_list.h \
-			 osrf_big_list.h \
 			 osrf_hash.h \
-			 osrf_big_hash.h \
 			 xml_utils.h
 
 all: xml_utils.o $(TARGETS) copy 
@@ -57,9 +53,9 @@ osrfConfig.o:	osrfConfig.c osrfConfig.h xml_utils.o
 osrf_application.o: osrf_application.c osrf_application.h
 osrf_cache.o:	osrf_cache.c osrf_cache.h
 osrf_list.o:	osrf_list.c osrf_list.h
-osrf_big_list.o:	osrf_big_list.c osrf_big_list.h
+#osrf_big_list.o:	osrf_big_list.c osrf_big_list.h
 osrf_hash.o:	osrf_hash.c osrf_hash.h
-osrf_big_hash.o:	osrf_big_hash.c osrf_big_hash.h
+#osrf_big_hash.o:	osrf_big_hash.c osrf_big_hash.h
 
 
 clean:
-- 
2.11.0