From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Wed, 14 Dec 2005 12:13:49 +0000 (+0000)
Subject: fixes for #13855 and #14025
X-Git-Tag: before_merge_to_branch_1_0_0_RC15~29
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=f2856f2d1866dfc726e5c545a32e41169b128f5a;p=jra1mw.git

fixes for #13855 and #14025
---

diff --git a/org.glite.jp.client/Makefile b/org.glite.jp.client/Makefile
index 1e5ece2..7d24712 100644
--- a/org.glite.jp.client/Makefile
+++ b/org.glite.jp.client/Makefile
@@ -29,8 +29,8 @@ VPATH=${top_srcdir}/src:${top_srcdir}/examples:${top_srcdir}/project$:${top_srcd
 GLOBUS_LIBS:=-L${globus_prefix}/lib \
 	-lglobus_common_${nothrflavour} \
 	-lglobus_gssapi_gsi_${nothrflavour} \
-	-lglobus_ftp_client_gcc32dbg \
-	-lglobus_ftp_control_gcc32dbg
+	-lglobus_ftp_client_${nothrflavour} \
+	-lglobus_ftp_control_${nothrflavour}
 
 GLOBUS_CFLAGS:=-I${globus_prefix}/include/${nothrflavour}
 
@@ -80,15 +80,18 @@ compile: ${daemon} ${LIB} ${EXAMPLES}
 
 examples: ${EXAMPLES}
 
+# XXX: should depend on -ltar but we have no dynamic version so far :-(
 ${LIB}: ${LIBOBJS}
-	${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${glite_location}/lib ${LBMAILDIRLIB} -ltar
+	${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${glite_location}/lib ${LBMAILDIRLIB} 
 
 ${daemon}: ${OBJS}
 	${LINK} -o $@ ${OBJS} ${LBMAILDIRLIB} ${GSOAPLIB} ${GLOBUS_LIBS}
 
 ${EXAMPLES}: ${LIB}
+
+# XXX: -ltar should be in the library
 ${EXAMPLES}: %: %.o
-	${LINK} -o $@ $< ${LIB} ${LBMAILDIRLIB} 
+	${LINK} -o $@ $< ${LIB} ${LBMAILDIRLIB}  -ltar