From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Mon, 27 Feb 2006 09:41:04 +0000 (+0000)
Subject: Avoid mixing threaded and non-trheaded globus libraries
X-Git-Tag: glite-lb-logger_R_1_2_2~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=fc90637c10c41b431c43302c1c419991778c6f1f;p=jra1mw.git

Avoid mixing threaded and non-trheaded globus libraries
---

diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 5f9cb69..0690f3d 100644
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -92,19 +92,15 @@ INTERLOG_TEST_OBJS:= \
 	il_test.o 
 
 glite_lb_logd: ${LOGD_OBJS}
-	${LINK} -o $@ ${LOGD_OBJS} ${COMMON_LIB}_${nothrflavour} ${GLITE_GSS_LIB}_${nothrflavour} ${EXT_LIBS} ${GLOBUS_LIBS}
+	${LINK} -o $@ ${LOGD_OBJS} ${COMMON_LIB}_${nothrflavour} 
 
 glite_lb_interlogd: ${INTERLOG_OBJS}
 	${LINK} -o $@ ${INTERLOG_OBJS} \
-		${COMMON_LIB}_${thrflavour} \
-		${GLITE_GSS_LIB}_${nothrflavour} \
-		${EXT_LIBS} ${GLOBUS_THRLIBS} -lpthread
+		${COMMON_LIB}_${thrflavour} 
 
 glite_lb_notif_interlogd: ${INTERLOG_NOBJS}
 	${LINK} -o $@ ${INTERLOG_NOBJS} \
-		${COMMON_LIB}_${thrflavour} \
-		${GLITE_GSS_LIB}_${nothrflavour} \
-		${EXT_LIBS} ${GLOBUS_THRLIBS} -lpthread
+		${COMMON_LIB}_${thrflavour}
 
 default: all
 
@@ -125,7 +121,7 @@ check.ll:
 	-echo commented out -- fix needed
 
 check.il: ${INTERLOG_TEST_OBJS}
-	${LINKXX} -o $@ ${COMMON_LIB}_${thrflavour} ${GLITE_GSS_LIB}_${nothrflavour} ${EXT_LIBS} ${GLOBUS_THRLIBS} ${TEST_LIBS} -lpthread $+
+	${LINKXX} -o $@ ${COMMON_LIB}_${thrflavour} ${GLITE_GSS_LIB}_${nothrflavour} ${TEST_LIBS} -lpthread $+
 
 dist: distsrc distbin
 
diff --git a/org.glite.lb.logger/project/version.properties b/org.glite.lb.logger/project/version.properties
index af47cb8..ea573ab 100644
--- a/org.glite.lb.logger/project/version.properties
+++ b/org.glite.lb.logger/project/version.properties
@@ -1,4 +1,4 @@
 #Fri Sep 02 14:18:17 CEST 2005
-module.version=1.2.1
+module.version=1.2.2
 module.build=2
 module.age=1