From 95f8353807db3ca5a897c6120d75d5c97bcb5dd6 Mon Sep 17 00:00:00 2001 From: erickson Date: Thu, 18 Jan 2007 19:30:34 +0000 Subject: [PATCH] removed libjudy dependencies from makefiles git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@813 9efc2488-bf62-4759-914b-345cdb29e865 --- src/Makefile | 9 ++------- src/libstack/Makefile | 6 +----- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/Makefile b/src/Makefile index fc8d8bb..1955932 100644 --- a/src/Makefile +++ b/src/Makefile @@ -38,8 +38,6 @@ OPENSRF_TARGETS = libtransport/transport_session.o \ utils/log.o \ utils/md5.o \ utils/sha.o - #libstack/osrf_big_list.o \ - libstack/osrf_big_hash.o \ OPENSRF_HEADERS = libtransport/transport_session.h \ libtransport/transport_client.h \ @@ -63,9 +61,6 @@ OPENSRF_HEADERS = libtransport/transport_session.h \ utils/log.h \ utils/md5.h \ utils/sha.h - #libstack/osrf_big_list.h \ - libstack/osrf_big_hash.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/src/libstack/Makefile b/src/libstack/Makefile index 0e505b4..82fae9a 100644 --- a/src/libstack/Makefile +++ b/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 \ @@ -18,8 +18,6 @@ TARGETS = osrf_message.o \ osrf_list.o \ osrf_hash.o \ xml_utils.o - #osrf_big_hash.o \ - osrf_big_list.o \ HEADERS = osrf_message.h \ osrf_app_session.h \ @@ -34,8 +32,6 @@ HEADERS = osrf_message.h \ osrf_list.h \ osrf_hash.h \ xml_utils.h - #osrf_big_hash.h \ - osrf_big_list.h \ all: xml_utils.o $(TARGETS) copy -- 2.11.0