Date: Tuesday, March 13, 2007 @ 15:07:17
Author: marc
Path: /cvsroot/carob/carob
Modified: GNUmakefile (1.28 -> 1.29) make-includes/darwinlibtool-linker.mk
(1.3 -> 1.4) make-includes/defaults.mk (1.2 -> 1.3)
test/GNUmakefile (1.47 -> 1.48)
Now creating libcarob.so.0.7.4 instead of libcarob.so.1
---------------------------------------+
GNUmakefile | 11 ++++++-----
make-includes/darwinlibtool-linker.mk | 2 ++
make-includes/defaults.mk | 10 +++++++++-
test/GNUmakefile | 2 +-
4 files changed, 18 insertions(+), 7 deletions(-)
Index: carob/GNUmakefile
diff -u carob/GNUmakefile:1.28 carob/GNUmakefile:1.29
--- carob/GNUmakefile:1.28 Fri Mar 9 20:20:52 2007
+++ carob/GNUmakefile Tue Mar 13 15:07:17 2007
@@ -109,14 +109,15 @@
DOC_HTML = ${DOC_OUT}/index.html
all: lib static
-lib: ${LIB_CAROB_SONAME}
+lib: ${LIB_CAROB_REALNAME}
static: ${LIB_CAROB_STATIC}
test: all
$(MAKE) -C test
-${LIB_CAROB_SONAME}: ${OBJS}
- ${CXX} ${CXXFLAGS} ${OBJS} ${SHARED_LDFLAGS} ${LDFLAGS} ${LDLIBS} -o
${LIB_CAROB_SONAME}
- - ${LN} -f ${LIB_CAROB_SONAME} ${LIB_CAROB_LINKNAME}
+${LIB_CAROB_REALNAME}: ${OBJS}
+ ${CXX} ${CXXFLAGS} ${OBJS} ${SHARED_LDFLAGS} ${LDFLAGS} ${LDLIBS} -o
${LIB_CAROB_REALNAME}
+ - ${LN} -f ${LIB_CAROB_REALNAME} ${LIB_CAROB_SONAME}
+ - ${LN} -f ${LIB_CAROB_REALNAME} ${LIB_CAROB_LINKNAME}
${LIB_CAROB_STATIC}: ${OBJS}
${AR} ${ARFLAGS} ${LIB_CAROB_STATIC} ${OBJS}
@@ -126,7 +127,7 @@
clean: clean-lib clean-test clean-doc clean-check
clean-lib:
- ${RM} ${SRCDIR}/*.o ${LIB_CAROB_SONAME} ${LIB_CAROB_LINKNAME}
${LIB_CAROB_STATIC}
+ ${RM} ${SRCDIR}/*.o ${LIB_CAROB_SONAME} ${LIB_CAROB_LINKNAME}
${LIB_CAROB_REALNAME} ${LIB_CAROB_STATIC}
clean-test:
$(MAKE) -C test clean
clean-doc:
Index: carob/make-includes/darwinlibtool-linker.mk
diff -u carob/make-includes/darwinlibtool-linker.mk:1.3
carob/make-includes/darwinlibtool-linker.mk:1.4
--- carob/make-includes/darwinlibtool-linker.mk:1.3 Mon Jan 22 17:19:23 2007
+++ carob/make-includes/darwinlibtool-linker.mk Tue Mar 13 15:07:17 2007
@@ -10,6 +10,8 @@
ARFLAGS = -v -o
+# UNTESTED since the SONAME/REALNAME fix
+
LIB_CAROB_LINKNAME = lib${CAROB}.dylib
LIB_CAROB_SONAME = lib${CAROB}.${CAROB_MAJOR_VERSION}.dylib
Index: carob/make-includes/defaults.mk
diff -u carob/make-includes/defaults.mk:1.2 carob/make-includes/defaults.mk:1.3
--- carob/make-includes/defaults.mk:1.2 Mon Jan 22 17:02:42 2007
+++ carob/make-includes/defaults.mk Tue Mar 13 15:07:17 2007
@@ -16,10 +16,18 @@
# http://fink.sourceforge.net/doc/porting/porting.en.html
# http://godi.ocaml-programming.de/project-doc/finding_libraries.txt
-CAROB_MAJOR_VERSION = 1
+
+# Before implementing version numbers a "libcarob.so.1" file was
+# always built. It was a mistake.
+
+CAROB_MAJOR_VERSION = 0
+CAROB_MINOR_VERSION = 7
+CAROB_REVISION = .4
+
CAROB = carob
LIB_CAROB_LINKNAME = lib${CAROB}.so
LIB_CAROB_SONAME = ${LIB_CAROB_LINKNAME}.${CAROB_MAJOR_VERSION}
+LIB_CAROB_REALNAME =
${LIB_CAROB_SONAME}.${CAROB_MINOR_VERSION}${CAROB_REVISION}
LIB_CAROB_STATIC = lib${CAROB}.a
Index: carob/test/GNUmakefile
diff -u carob/test/GNUmakefile:1.47 carob/test/GNUmakefile:1.48
--- carob/test/GNUmakefile:1.47 Fri Mar 9 18:16:03 2007
+++ carob/test/GNUmakefile Tue Mar 13 15:07:17 2007
@@ -33,7 +33,7 @@
include ${MKINCLUDES}/defaults.mk
-LIB_CAROB_SO = ${CAROB_ROOT}/${LIB_CAROB_SONAME}
+LIB_CAROB_SO = ${CAROB_ROOT}/${LIB_CAROB_REALNAME}
LIB_CAROB_A = ${CAROB_ROOT}/${LIB_CAROB_STATIC}
# customization
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
