From: František Dvořák <valtri@civ.zcu.cz>
Date: Fri, 5 Mar 2010 17:43:43 +0000 (+0000)
Subject: Proper versions of dynamic libraries in lbjp-common subsytem.
X-Git-Tag: glite-lb-harvester_R_1_0_4_1~13
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=5444efbf00c8dd5a8206cd9eef5af27d298de2ee;p=jra1mw.git

Proper versions of dynamic libraries in lbjp-common subsytem.
---

diff --git a/org.glite.lbjp-common.db/Makefile b/org.glite.lbjp-common.db/Makefile
index dafb817..31c0c99 100644
--- a/org.glite.lbjp-common.db/Makefile
+++ b/org.glite.lbjp-common.db/Makefile
@@ -17,6 +17,8 @@ nothrflavour=gcc32
 -include Makefile.inc
 -include ../project/version.properties
 
+version=${module.version}
+
 CC=gcc
 
 VPATH=${top_srcdir}/interface:${top_srcdir}/src:${top_srcdir}/examples
@@ -67,6 +69,21 @@ HDRS:=db.h
 LOBJS:=${OBJS:.o=.lo}
 LTESTOBJS:=${TESTOBJS:.o=.lo}
 
+# In order to use libtool versioning correcty, we must have:
+#
+# current = major + minor + offset
+# revision = patch
+# age = minor
+#
+# where offset is a sum of maximal released minor's of all previous major's
+# 
+
+# counted minors: 1.0
+offset=0
+
+version_info:=-version-info ${shell \
+	perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' }
+
 default all: compile doc
 
 check_soname:
@@ -84,10 +101,10 @@ check_soname:
 	fi
 
 libglite_lbu_db.la: check_soname ${LOBJS}
-	${LINK} -o $@ $+ ${EXT_LIBS}
+	${LINK} ${version_info} -o $@ $+ ${EXT_LIBS}
 
 libglite_lbu_dbtest.la: check_soname ${LTESTOBJS}
-	${LINK} -o $@ $+ ${EXT_LIBS}
+	${LINK} ${version_info} -o $@ $+ ${EXT_LIBS}
 
 dbtest.lo dbtest.o: db.c db.h
 	${COMPILE} -DGLITE_LBU_DEFAULT_RESULT_BUFFER_LENGTH=10 -c $< -o $@
diff --git a/org.glite.lbjp-common.jp-interface/Makefile b/org.glite.lbjp-common.jp-interface/Makefile
index 9bcaf55..b754a23 100644
--- a/org.glite.lbjp-common.jp-interface/Makefile
+++ b/org.glite.lbjp-common.jp-interface/Makefile
@@ -18,14 +18,27 @@ gsoap_prefix=/software/gsoap-2.6
 CC=gcc
 
 -include Makefile.inc
+-include ../project/version.properties
 
+version=${module.version}
 
 VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/project:${jpproject}
 
 DEBUG:=-g -O0 -W -Wno-sign-compare
 CFLAGS:=${DEBUG} -D_GNU_SOURCE -I. -I${top_srcdir}/interface -I${stagedir}/include
 
+# In order to use libtool versioning correcty, we must have:
+#
+# current = major + minor + offset
+# revision = patch
+# age = minor
+#
+# where offset is a sum of maximal released minor's of all previous major's
+# 
+
+# counted minors: n/a
 offset=0
+
 version_info:=-version-info ${shell \
 	perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' }
 
diff --git a/org.glite.lbjp-common.maildir/Makefile b/org.glite.lbjp-common.maildir/Makefile
index 64d0c58..0c3b3e7 100644
--- a/org.glite.lbjp-common.maildir/Makefile
+++ b/org.glite.lbjp-common.maildir/Makefile
@@ -18,6 +18,8 @@ nothrflavour=gcc32
 -include Makefile.inc
 -include ../project/version.properties
 
+version=${module.version}
+
 CC=gcc
 
 VPATH=${top_srcdir}/interface:${top_srcdir}/src:${top_srcdir}/examples
@@ -43,10 +45,25 @@ OBJS:=maildir.o
 HDRS:=maildir.h
 LOBJS:=${OBJS:.o=.lo}
 
+# In order to use libtool versioning correcty, we must have:
+#
+# current = major + minor + offset
+# revision = patch
+# age = minor
+#
+# where offset is a sum of maximal released minor's of all previous major's
+# 
+
+# counted minors: n/a
+offset=0
+
+version_info:=-version-info ${shell \
+	perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' }
+
 default all: compile doc
 
 libglite_lbu_maildir.la: ${LOBJS}
-	${LINK} -o $@ $< ${EXT_LIBS}
+	${LINK} ${version_info} -o $@ $< ${EXT_LIBS}
 
 compile: libglite_lbu_maildir.la
 
diff --git a/org.glite.lbjp-common.server-bones/Makefile b/org.glite.lbjp-common.server-bones/Makefile
index b835bd7..207de7b 100644
--- a/org.glite.lbjp-common.server-bones/Makefile
+++ b/org.glite.lbjp-common.server-bones/Makefile
@@ -12,6 +12,8 @@ CC=gcc
 -include Makefile.inc
 -include ../project/version.properties
 
+version=${module.version}
+
 VPATH=${top_srcdir}/src:${top_srcdir}/examples
 
 DEBUG:=-g -O0 -Wall
@@ -40,6 +42,21 @@ LOBJS:=${OBJS:.o=.lo}
 
 HDRS:=srvbones.h
 
+# In order to use libtool versioning correcty, we must have:
+#
+# current = major + minor + offset
+# revision = patch
+# age = minor
+#
+# where offset is a sum of maximal released minor's of all previous major's
+# 
+
+# counted minors: n/a
+offset=0
+
+version_info:=-version-info ${shell \
+	perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' }
+
 default all: compile
 
 compile: ${STATICLIB} ${LTLIB} example
@@ -49,7 +66,7 @@ ${STATICLIB}: ${OBJS}
 	ranlib $@
 
 ${LTLIB}: ${LOBJS}
-	${LINK} -o $@ ${LOBJS} ${LOG4C_LIBS}
+	${LINK} ${version_info} -o $@ ${LOBJS} ${LOG4C_LIBS}
 
 stage: compile
 	$(MAKE) install PREFIX=${stagedir} DOSTAGE=yes
diff --git a/org.glite.lbjp-common.trio/Makefile b/org.glite.lbjp-common.trio/Makefile
index 2d0d747..471b708 100644
--- a/org.glite.lbjp-common.trio/Makefile
+++ b/org.glite.lbjp-common.trio/Makefile
@@ -13,6 +13,8 @@ lbuprefix=lbu
 -include Makefile.inc
 -include ../project/version.properties
 
+version=${module.version}
+
 VPATH=${top_srcdir}/src:${top_srcdir}/test::${top_srcdir}/doc
 
 CC=gcc