removed dependency on lb-client

diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index d94ccb1..6a34885 100644 (file)
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -222,4 +222,5 @@ il_test.o IlTestBase.o server_msgTest.o event_queueTest.o input_queue_socketTest
        ${CXX} ${CFLAGS} ${GLOBUSTHRINC} ${TEST_INC} -c $< -o $@
 
 clean:
-       rm -rf .libs/ *.o *.no ${LOGD} ${INTERLOGD} ${NOTIF_INTERLOGD} 
+       rm -rvf .libs/ *.o *.no ${LOGD} ${INTERLOGD} ${NOTIF_INTERLOGD} 
+       rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/

diff --git a/org.glite.lb.logger/src/event_store.c b/org.glite.lb.logger/src/event_store.c
index 37dd4f9..915c949 100644 (file)
--- a/org.glite.lb.logger/src/event_store.c
+++ b/org.glite.lb.logger/src/event_store.c
@@ -13,7 +13,6 @@
 #endif
 #include <fcntl.h>
 
-#include "glite/lb/consumer.h"
 #include "glite/lb/events_parse.h"
 
 #include "interlogd.h"

diff --git a/org.glite.lb.logger/src/interlogd.c b/org.glite.lb.logger/src/interlogd.c
index 010a8bc..260f313 100644 (file)
--- a/org.glite.lb.logger/src/interlogd.c
+++ b/org.glite.lb.logger/src/interlogd.c
@@ -12,7 +12,6 @@
 #include <globus_common.h>
 
 #include "interlogd.h"
-#include "glite/lb/consumer.h"
 #include "glite/lb/log_proto.h"
 #include "glite/security/glite_gss.h"
 #ifdef LB_PERF

diff --git a/org.glite.lb.logger/src/logd.c b/org.glite.lb.logger/src/logd.c
index c70435e..0b8adf7 100644 (file)
--- a/org.glite.lb.logger/src/logd.c
+++ b/org.glite.lb.logger/src/logd.c
@@ -15,8 +15,8 @@
 #include <globus_common.h>
 
 #include "glite/lb/context-int.h"
+#include "glite/lb/timeouts.h"
 #include "logd_proto.h"
-#include "glite/lb/consumer.h"
 #include "glite/security/glite_gss.h"
 #ifdef LB_PERF
 #include "glite/lb/lb_perftest.h"

diff --git a/org.glite.lb.logger/src/queue_mgr.c b/org.glite.lb.logger/src/queue_mgr.c
index abae1f3..c973a38 100644 (file)
--- a/org.glite.lb.logger/src/queue_mgr.c
+++ b/org.glite.lb.logger/src/queue_mgr.c
@@ -4,7 +4,8 @@
 #include <errno.h>
 #include <assert.h>
 
-#include "glite/lb/consumer.h"
+#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/lb/context.h"
 
 #include "interlogd.h"
 

diff --git a/org.glite.lb.logger/src/server_msg.c b/org.glite.lb.logger/src/server_msg.c
index 3b1002d..7f23e98 100644 (file)
--- a/org.glite.lb.logger/src/server_msg.c
+++ b/org.glite.lb.logger/src/server_msg.c
@@ -7,7 +7,6 @@
 #include "interlogd.h"
 #include "glite/lb/il_msg.h" 
 #include "glite/lb/events_parse.h"
-#include "glite/lb/consumer.h"
 #include "glite/lb/context.h"
 
 static