From a8376c4962d43793b528aece84b84ff56e27be06 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Wed, 28 Mar 2007 12:04:04 +0000
Subject: [PATCH] merge from RC31

---
 org.glite.jp.common/Makefile                   | 23 ++++++++++++-----------
 org.glite.jp.common/project/version.properties |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/org.glite.jp.common/Makefile b/org.glite.jp.common/Makefile
index 26977c6..88a27f0 100644
--- a/org.glite.jp.common/Makefile
+++ b/org.glite.jp.common/Makefile
@@ -25,13 +25,10 @@ CC=gcc
 VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/project:${jpproject}
 
 GLOBUSINC:= -I${globus_prefix}/include/${nothrflavour}
-
+GLOBUSINCTHR:= -I${globus_prefix}/include/${thrflavour}
 
 DEBUG:=-g -O0 
-CFLAGS:=${DEBUG} -I. -I${top_srcdir}/interface -I${stagedir}/include \
-	${GLOBUSINC}
-
-LDFLAGS:=-L${globus_prefix}/lib
+CFLAGS:=${DEBUG} -I. -I${top_srcdir}/interface -I${stagedir}/include
 
 offset=0
 version_info:=-version-info ${shell \
@@ -47,8 +44,9 @@ HDRS:=types.h context.h strmd5.h attr.h known_attr.h trio.h escape.h
 
 SRCS:=context.c strmd5.c attr.c
 OBJS:=${SRCS:.c=.lo}
-LIBS:=-lcrypto_${nothrflavour}
-LIBS_THR:=-lcrypto_${thrflavour}
+THROBJS:=${OBJS:.o=.thr.lo}
+LIBS:=-L${globus_prefix}/lib -lcrypto_${nothrflavour}
+THRLIBS:=-L${globus_prefix}/lib -lcrypto_${thrflavour}
 
 commonlib:= libglite_jp_common_${nothrflavour}.la
 commonlib_thr:= libglite_jp_common_${thrflavour}.la
@@ -63,13 +61,13 @@ TEST_INC:=-I${cppunit}/include
 
 default all: compile
 
-compile: ${commonlib} ${commonlib_thr} ${TRIO_LIB} 
+compile: ${commonlib} ${commonlib_thr} ${TRIO_LIB}
 
 ${commonlib}: ${OBJS}
 	${LINK} -o $@ ${OBJS} ${LIBS}
 
-${commonlib_thr}: ${OBJS}
-	${LINK} -o $@ ${OBJS} ${LIBS}
+${commonlib_thr}: ${THROBJS}
+	${LINK} -o $@ ${THROBJS} ${THRLIBS}
 
 ${TRIO_LIB}: ${TRIO_LOBJS}
 	${LINK} ${version_info} -o $@ ${TRIO_LOBJS} -lm
@@ -109,8 +107,11 @@ distbin:
         
 clean:
 
+%.thr.lo: %.c
+	${COMPILE} ${GLOBUSTHRINC} -o $@ -c $<
+
 %.lo: %.c
-	${COMPILE} -o $@ -c $< 
+	${COMPILE} ${GLOBUSINC} -o $@ -c $< 
 
 ${TRIO_LOBJS}: %.lo: %.c
 	${COMPILE} -o $@ -c -DDATAGRID_EXTENSION $< 
diff --git a/org.glite.jp.common/project/version.properties b/org.glite.jp.common/project/version.properties
index bcf5d00..c85acf7 100644
--- a/org.glite.jp.common/project/version.properties
+++ b/org.glite.jp.common/project/version.properties
@@ -1,2 +1,2 @@
 module.version=1.2.1
-module.age=1
+module.age=3
-- 
1.8.2.3