From: František Dvořák <valtri@civ.zcu.cz>
Date: Mon, 7 Mar 2011 22:24:12 +0000 (+0000)
Subject: Proper flavour fix of the lb.common in EMI, build fixes.
X-Git-Tag: glite-lb-client_R_5_0_3_1~4
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=2c38408a687a2d58847075e11f2bc36adbedd03c;p=jra1mw.git

Proper flavour fix of the lb.common in EMI, build fixes.
---

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index c2b24f1..47704d5 100644
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -205,12 +205,12 @@ default: all
 
 ifeq (${thrflavour},)
 ${LIB}: ${LIBTHROBJS}
-	${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${PREFIX}${prefix}/${libdir} \
+	${LINK} ${version_info} -o $@ ${LIBTHRLOBJS} -rpath ${PREFIX}${prefix}/${libdir} \
 			${COMMON_LIB} ${TRIO_LIB} \
 			-lglite_security_gss
 
 ${PLUSLIB}: ${PLUSTHROBJS} ${LIB}
-	${LINKXX} ${version_info} -o $@ ${PLUSLOBJS} -rpath ${PREFIX}${prefix}/${libdir} ${LIB} ${PLUS_EXTRA_LIB}
+	${LINKXX} ${version_info} -o $@ ${PLUSTHRLOBJS} -rpath ${PREFIX}${prefix}/${libdir} ${LIB} ${PLUS_EXTRA_LIB}
 else
 ${NOTHRLIB}: ${LIBOBJS}
 	${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${PREFIX}${prefix}/${libdir} \
diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 8229648..f0dff5f 100644
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -147,12 +147,12 @@ version_info:=-version-info ${shell \
 	perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' }
 
 ifeq (${thrflavour},)
-${STATICLIB}: ${OBJS}
-	ar crv $@ ${OBJS}
+${STATICLIB}: ${THROBJS}
+	ar crv $@ ${THROBJS}
 	ranlib $@
 
-${LTLIB}: ${OBJS}
-	${LINKXX} ${version_info} -o $@ ${LOBJS} \
+${LTLIB}: ${THROBJS}
+	${LINKXX} ${version_info} -o $@ ${THRLOBJS} \
 		-lglite_security_gss \
 		${EXT_LIBS} \
 		-lm
diff --git a/org.glite.lbjp-common.gsoap-plugin/Makefile b/org.glite.lbjp-common.gsoap-plugin/Makefile
index 85a8974..e6b85e3 100644
--- a/org.glite.lbjp-common.gsoap-plugin/Makefile
+++ b/org.glite.lbjp-common.gsoap-plugin/Makefile
@@ -149,18 +149,18 @@ THROBJS_S:=${OBJS_S:.o=.thr.o}
 THRLOBJS_S:=${OBJS_S:.o=.thr.lo}
 
 ifeq (${thrflavour},)
-${STATICLIB}: ${THROBJS}
-	ar crv $@ ${THROBJS}
+${STATICLIB}: ${OBJS}
+	ar crv $@ ${OBJS}
 	ranlib $@
 
-${LTLIB}: ${THROBJS}
-	${LINK_lang} ${version_info} -o $@ ${THRLOBJS} ${EX_LIBS}
+${LTLIB}: ${OBJS}
+	${LINK_lang} ${version_info} -o $@ ${LOBJS} ${EX_LIBS}
 
-${STATICLIB_S}: ${THROBJS_S}
-	ar crv $@ ${THROBJS_S}
+${STATICLIB_S}: ${OBJS_S}
+	ar crv $@ ${OBJS_S}
 	ranlib $@
 
-${LTLIB_S}: ${THROBJS_S}
+${LTLIB_S}: ${OBJS_S}
 	${LINK_lang} ${version_info} -o $@ ${LOBJS_S} ${EX_LIBS} ${GSOAP_DEFAULT_LIBS}
 else
 ${NOTHRSTATICLIB}: ${OBJS}
diff --git a/org.glite.lbjp-common.gss/Makefile b/org.glite.lbjp-common.gss/Makefile
index 3e9c5f6..075f796 100644
--- a/org.glite.lbjp-common.gss/Makefile
+++ b/org.glite.lbjp-common.gss/Makefile
@@ -99,12 +99,12 @@ endif
 
 
 ifeq ($(thrflavour),)
-${GSS_STATICLIB}: ${GSS_THROBJS}
-	ar crv $@ ${GSS_THROBJS}
+${GSS_STATICLIB}: ${GSS_OBJS}
+	ar crv $@ ${GSS_OBJS}
 	ranlib $@
 
-${GSS_LTLIB}: ${GSS_THROBJS}
-	${LINK} ${version_info} -o $@ ${GSS_THRLOBJS} ${GLOBUS_GSSAPI_GSI_LIBS} ${LIBCARES_LIBS}
+${GSS_LTLIB}: ${GSS_OBJS}
+	${LINK} ${version_info} -o $@ ${GSS_LOBJS} ${GLOBUS_GSSAPI_GSI_LIBS} ${LIBCARES_LIBS}
 else
 ${GSS_NOTHRSTATICLIB}: ${GSS_OBJS}
 	ar crv $@ ${GSS_OBJS}
diff --git a/org.glite.px.proxyrenewal/Makefile b/org.glite.px.proxyrenewal/Makefile
index f141a67..f595e20 100644
--- a/org.glite.px.proxyrenewal/Makefile
+++ b/org.glite.px.proxyrenewal/Makefile
@@ -124,11 +124,11 @@ startup: ${top_srcdir}/config/startup
 	chmod +x $@
 
 ifeq (${thrflavour},)
-${LIB}: ${THRLIBOBJ}
-	${LINK} ${version_info} -o $@ ${THRLIBLOBJ} -rpath ${glite_location}/${libdir}
+${LIB}: ${LIBOBJ}
+	${LINK} ${version_info} -o $@ ${LIBLOBJ} -rpath ${glite_location}/${libdir}
 
-${LIB_CORE}: ${LIB_CORE_THR_OBJS}
-	${LINK} ${version_info} -o $@ ${LIB_CORE_THR_LOBJS} -rpath ${glite_location}/${libdir} ${MYPROXY_LIBS} ${VOMS_LIBS}
+${LIB_CORE}: ${LIB_CORE_OBJS}
+	${LINK} ${version_info} -o $@ ${LIB_CORE_LOBJS} -rpath ${glite_location}/${libdir} ${MYPROXY_LIBS} ${VOMS_LIBS}
 else
 ${NOTHRLIB}: ${LIBOBJ}
 	${LINK} ${version_info} -o $@ ${LIBLOBJ} -rpath ${glite_location}/${libdir}