From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Thu, 1 Sep 2005 08:31:54 +0000 (+0000)
Subject: A FIXME comment how libtool versions should be computed some time in future.
X-Git-Tag: gridsite-core_R_1_1_11~43
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=bcb483d5e59aa48b2cc0c1f6f2adf7ee48fcb31f;p=jra1mw.git

A FIXME comment how libtool versions should be computed some time in future.
---

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 8d7c5e9..93708e8 100644
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -75,7 +75,7 @@ EXT_LIBS:= ${EXPAT_LIBS} ${ARES_LIBS} ${GLOBUS_LIBS}
 TEST_LIBS:=-L${cppunit}/lib -lcppunit
 TEST_INC:=-I${cppunit}/include
 
-COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
+COMPILE:=libtool --mode=compile ${CC}
 LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib ${LDFLAGS} 
 LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/lib ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
@@ -111,6 +111,14 @@ default: all
 all compile: check_version ${STATICLIB} ${LTLIB} ${THRSTATICLIB} ${THRLTLIB} ${TRIO_LIB} ${MAILDIR_LIB}
 # all compile: ${STATICLIB} ${LTLIB} ${THRSTATICLIB} ${THRLTLIB}
 
+# FIXME: to use libtool versioning correcty, we should have:
+#
+# current = major + minor + offset
+# revision = patch
+# age = minor
+#
+# where offset is a sum of maximal released minor's of all previous major's
+# 
 version_info=-version-info `echo ${version} | cut -d. -f1,2 | tr . :`
 
 ${STATICLIB}: ${OBJS}
@@ -195,13 +203,13 @@ clean:
 
 
 %.o: %.c
-	${COMPILE} ${GLOBUSINC} -c $<
+	${COMPILE} ${GLOBUSINC} ${CFLAGS} -c $<
 
 il_int_test.o il_string_test.o il_test.o il_msg_test.o: %.o: %.cpp
 	${CXX} -c ${CFLAGS} ${TEST_INC} $<
 
 %.thr.o: %.c
-	${COMPILE} ${GLOBUSTHRINC} -o $@ -c $<
+	${COMPILE} ${GLOBUSTHRINC} ${CFLAGS} -o $@ -c $<
 
 %.h: %.h.T
 	rm -f $@