remove dependency on server

diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile
index 7564095..d4ae7fc 100644 (file)
--- a/org.glite.lb.utils/Makefile
+++ b/org.glite.lb.utils/Makefile
@@ -44,25 +44,15 @@ INSTALL:=libtool --mode=install install
 LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/lib ${LDFLAGS}
 XSLTPROC:=xsltproc --novalid
 
-ifneq (${mysql_prefix},/usr)
-       ifeq ($(shell echo ${mysql_version} | cut -d. -f1,2),4.1)
-               mysqlib := -L${mysql_prefix}/lib/mysql
-       else
-               mysqlib := -L${mysql_prefix}/lib
-       endif
-endif
-
 ifneq (${expat_prefix},/usr)
        expatlib := -L${expat_prefix}/lib
 endif
 
 EXT_LIBS:= \
-       ${mysqlib} -lmysqlclient -lz\
        ${expatlib} -lexpat \
        ${GLOBUS_LIBS}
 COMMON_LIB:=-lglite_lb_common_${nothrflavour}
 CLIENT_LIB:=-lglite_lb_client_${nothrflavour}
-BKSERVER_LIB:=-lglite_lb_bkserver 
 JP_LIBS:=-lglite_jp_common_${nothrflavour} -lglite_jp_trio
 
 UTILS:=mon purge dump load dump_exporter
@@ -79,7 +69,7 @@ compile all: ${UTILS} ${MAN_GZ} statistics
        ${CC} ${CFLAGS} ${GLOBUSINC} -c $<
 
 ${UTILS}: %: %.o
-       ${LINK} -o $@ $< ${COMMON_LIB} ${CLIENT_LIB} ${BKSERVER_LIB} ${EXT_LIBS}
+       ${LINK} -o $@ $< ${COMMON_LIB} ${CLIENT_LIB} ${EXT_LIBS}
 
 statistics: statistics.o
        ${LINK} -rdynamic -o $@ $< ${COMMON_LIB} ${JP_LIBS} ${EXT_LIBS} 

diff --git a/org.glite.lb.utils/src/dump.c b/org.glite.lb.utils/src/dump.c
index c82e9e8..ab9417f 100644 (file)
--- a/org.glite.lb.utils/src/dump.c
+++ b/org.glite.lb.utils/src/dump.c
@@ -17,7 +17,6 @@
 #include "glite/lb/xml_parse.h"
 #include "glite/lb/mini_http.h"
 #include "glite/lb/consumer.h"
-#include "glite/lb/query.h" /* from server */
 
 #define dprintf(x) { if (debug) printf x; }
 

diff --git a/org.glite.lb.utils/src/load.c b/org.glite.lb.utils/src/load.c
index 1878b2c..e5c5b8c 100644 (file)
--- a/org.glite.lb.utils/src/load.c
+++ b/org.glite.lb.utils/src/load.c
@@ -17,7 +17,6 @@
 #include "glite/lb/xml_parse.h"
 #include "glite/lb/mini_http.h"
 #include "glite/lb/consumer.h"
-#include "glite/lb/query.h" /* from server */
 
 #define dprintf(x) { if (debug) printf x; }
 

diff --git a/org.glite.lb.utils/src/purge.c b/org.glite.lb.utils/src/purge.c
index 2ed6839..76ce637 100644 (file)
--- a/org.glite.lb.utils/src/purge.c
+++ b/org.glite.lb.utils/src/purge.c
@@ -17,7 +17,6 @@
 #include "glite/lb/mini_http.h"
 #include "glite/lb/query_rec.h"
 #include "glite/lb/consumer.h"
-#include "glite/lb/query.h" /* from server */
 
 #define dprintf(x) { if (debug) printf x; }