From 177ba4197feda33526f9f1236e22cc2e25468fb3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Mon, 7 Mar 2011 16:07:07 +0000
Subject: [PATCH] Proper flavor of the objects for the EPEL meal (threaded
 globus).

---
 org.glite.lb.client/Makefile                |  4 ++--
 org.glite.lbjp-common.gsoap-plugin/Makefile | 14 +++++++-------
 org.glite.lbjp-common.gss/Makefile          |  8 ++++----
 org.glite.px.proxyrenewal/Makefile          |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 2188305..c2b24f1 100644
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -204,12 +204,12 @@ generate: ${GEN_HDRS}
 default: all
 
 ifeq (${thrflavour},)
-${LIB}: ${LIBOBJS}
+${LIB}: ${LIBTHROBJS}
 	${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${PREFIX}${prefix}/${libdir} \
 			${COMMON_LIB} ${TRIO_LIB} \
 			-lglite_security_gss
 
-${PLUSLIB}: ${PLUSOBJS} ${LIB}
+${PLUSLIB}: ${PLUSTHROBJS} ${LIB}
 	${LINKXX} ${version_info} -o $@ ${PLUSLOBJS} -rpath ${PREFIX}${prefix}/${libdir} ${LIB} ${PLUS_EXTRA_LIB}
 else
 ${NOTHRLIB}: ${LIBOBJS}
diff --git a/org.glite.lbjp-common.gsoap-plugin/Makefile b/org.glite.lbjp-common.gsoap-plugin/Makefile
index e6b85e3..85a8974 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}: ${OBJS}
-	ar crv $@ ${OBJS}
+${STATICLIB}: ${THROBJS}
+	ar crv $@ ${THROBJS}
 	ranlib $@
 
-${LTLIB}: ${OBJS}
-	${LINK_lang} ${version_info} -o $@ ${LOBJS} ${EX_LIBS}
+${LTLIB}: ${THROBJS}
+	${LINK_lang} ${version_info} -o $@ ${THRLOBJS} ${EX_LIBS}
 
-${STATICLIB_S}: ${OBJS_S}
-	ar crv $@ ${OBJS_S}
+${STATICLIB_S}: ${THROBJS_S}
+	ar crv $@ ${THROBJS_S}
 	ranlib $@
 
-${LTLIB_S}: ${OBJS_S}
+${LTLIB_S}: ${THROBJS_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 075f796..3e9c5f6 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_OBJS}
-	ar crv $@ ${GSS_OBJS}
+${GSS_STATICLIB}: ${GSS_THROBJS}
+	ar crv $@ ${GSS_THROBJS}
 	ranlib $@
 
-${GSS_LTLIB}: ${GSS_OBJS}
-	${LINK} ${version_info} -o $@ ${GSS_LOBJS} ${GLOBUS_GSSAPI_GSI_LIBS} ${LIBCARES_LIBS}
+${GSS_LTLIB}: ${GSS_THROBJS}
+	${LINK} ${version_info} -o $@ ${GSS_THRLOBJS} ${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 76e3ffd..ffc5757 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}: ${LIBOBJ}
-	${LINK} ${version_info} -o $@ ${LIBLOBJ} -rpath ${glite_location}/${libdir}
+${LIB}: ${THRLIBOBJ}
+	${LINK} ${version_info} -o $@ ${THRLIBLOBJ} -rpath ${glite_location}/${libdir}
 
-${LIB_CORE}: ${LIB_CORE_OBJS}
-	${LINK} ${version_info} -o $@ ${LIB_CORE_LOBJS} -rpath ${glite_location}/${libdir} ${MYPROXY_LIBS} ${VOMS_LIBS}
+${LIB_CORE}: ${LIB_CORE_THR_OBJS}
+	${LINK} ${version_info} -o $@ ${LIB_CORE_THR_LOBJS} -rpath ${glite_location}/${libdir} ${MYPROXY_LIBS} ${VOMS_LIBS}
 else
 ${NOTHRLIB}: ${LIBOBJ}
 	${LINK} ${version_info} -o $@ ${LIBLOBJ} -rpath ${glite_location}/${libdir}
-- 
1.8.2.3