From bcbb109410aede1a0f2196221aeef06a948a0b3c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 2 Apr 2010 14:58:03 +0000 Subject: [PATCH] Updates and fix with the latest changes. --- org.glite.lb.logger/Makefile | 4 +--- org.glite.lb.logger/src/interlogd.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile index 608afbc..e3a4c3a 100644 --- a/org.glite.lb.logger/Makefile +++ b/org.glite.lb.logger/Makefile @@ -44,14 +44,13 @@ endif DEBUG:=-g -O0 CFLAGS:=${DEBUG} \ -I${stagedir}/include -I${top_srcdir}/src \ - -I${log4c_prefix}/include \ -D_GNU_SOURCE \ ${COVERAGE_FLAGS} \ ${VERSION} ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} LDFLAGS:=-L${stagedir}/${libdir} \ - -L${log4c_prefix}/lib \ ${COVERAGE_FLAGS} + LINK:=libtool --mode=link ${CC} ${LDFLAGS} LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS} INSTALL:=libtool --mode=install install @@ -80,7 +79,6 @@ INTERLOG_OBJS:=il_error.o input_queue_socket.o \ recover.o send_event.o plugin_mgr.o \ event_queue.o event_store.o il_master.o interlogd.o \ queue_mgr.o server_msg.o queue_thread.o \ - plugin_mgr.o WS_INTERLOG_OBJS:=il_error.o input_queue_socket_http.o \ recover.o http.o send_event_http.o plugin_mgr.o \ diff --git a/org.glite.lb.logger/src/interlogd.h b/org.glite.lb.logger/src/interlogd.h index 56bccec..bdf0146 100644 --- a/org.glite.lb.logger/src/interlogd.h +++ b/org.glite.lb.logger/src/interlogd.h @@ -75,7 +75,7 @@ extern "C" { #define IL_EVENT_GET_UNIQUE(a) edg_wlc_JobIdGetUnique((a)) #define IL_EVENT_ID_FREE(a) edg_wlc_JobIdFree((a)) #define IL_EVENT_ID_PARSE(a,b) edg_wlc_JobIdParse((a),(b)) -#define IL_LOG_CATEGORY LOG_CATEGORY_IL_LB +#define IL_LOG_CATEGORY LOG_CATEGORY_LB_IL #endif -- 1.8.2.3