Avoid mixing threaded and non-trheaded globus libraries
authorAleš Křenek <ljocha@ics.muni.cz>
Mon, 27 Feb 2006 09:41:04 +0000 (09:41 +0000)
committerAleš Křenek <ljocha@ics.muni.cz>
Mon, 27 Feb 2006 09:41:04 +0000 (09:41 +0000)
org.glite.lb.logger/Makefile
org.glite.lb.logger/project/version.properties

index 5f9cb69..0690f3d 100644 (file)
@@ -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
 
index af47cb8..ea573ab 100644 (file)
@@ -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