From bf39de59c97bf7253a8995a7d218d883bd9beec2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Milo=C5=A1=20Mula=C4=8D?= Date: Mon, 16 Jan 2006 13:23:01 +0000 Subject: [PATCH] merge from pre_cares sub-branch --- org.glite.jp.client/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/org.glite.jp.client/Makefile b/org.glite.jp.client/Makefile index 3577e87..7377a36 100644 --- a/org.glite.jp.client/Makefile +++ b/org.glite.jp.client/Makefile @@ -28,8 +28,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} @@ -79,15 +79,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 -- 1.8.2.3