Date: Monday, January 22, 2007 @ 17:02:42
Author: marc
Path: /cvsroot/carob/carob
Modified: GNUmakefile (1.23 -> 1.24) make-includes/defaults.mk (1.1 ->
1.2) make-includes/gnu-linker.mk (1.5 -> 1.6)
make-includes/main.mk (1.8 -> 1.9) test/GNUmakefile (1.42 ->
1.43)
Renamed: LIB_CAROB to CAROB, LIB_CAROB_LIB_SHORT to LIB_CAROB_LINKNAME,
and LIB_CAROB_LIB to LIB_CAROB_SONAME.
-----------------------------+
GNUmakefile | 10 +++++-----
make-includes/defaults.mk | 20 +++++++++++++++-----
make-includes/gnu-linker.mk | 2 +-
make-includes/main.mk | 5 +++--
test/GNUmakefile | 2 +-
5 files changed, 25 insertions(+), 14 deletions(-)
Index: carob/GNUmakefile
diff -u carob/GNUmakefile:1.23 carob/GNUmakefile:1.24
--- carob/GNUmakefile:1.23 Mon Jan 22 15:51:24 2007
+++ carob/GNUmakefile Mon Jan 22 17:02:42 2007
@@ -106,21 +106,21 @@
DOC_HTML = ${DOC_OUT}/index.html
all: lib static
-lib: ${LIB_CAROB_LIB}
+lib: ${LIB_CAROB_SONAME}
static: ${LIB_CAROB_STATIC}
test: all
$(MAKE) -C test
-${LIB_CAROB_LIB}: ${OBJS}
- ${CXX} ${CXXFLAGS} ${OBJS} ${SHARED_LDFLAGS} ${LDFLAGS} ${LDLIBS} -o
${LIB_CAROB_LIB}
- - ${LN} -f ${LIB_CAROB_LIB} ${LIB_CAROB_LIB_SHORT}
+${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_STATIC}: ${OBJS}
${AR} ${ARFLAGS} ${LIB_CAROB_STATIC} ${OBJS}
clean: clean-lib clean-test clean-doc clean-check
clean-lib:
- ${RM} ${SRCDIR}/*.o ${LIB_CAROB_LIB} ${LIB_CAROB_LIB_SHORT}
${LIB_CAROB_STATIC}
+ ${RM} ${SRCDIR}/*.o ${LIB_CAROB_SONAME} ${LIB_CAROB_LINKNAME}
${LIB_CAROB_STATIC}
clean-test:
$(MAKE) -C test clean
clean-doc:
Index: carob/make-includes/defaults.mk
diff -u carob/make-includes/defaults.mk:1.1 carob/make-includes/defaults.mk:1.2
--- carob/make-includes/defaults.mk:1.1 Mon Jan 22 15:51:24 2007
+++ carob/make-includes/defaults.mk Mon Jan 22 17:02:42 2007
@@ -7,9 +7,19 @@
CAROB_ROOT = ..
-LIB_MAJOR_VERSION = 1
-LIB_CAROB = carob
-LIB_CAROB_LIB_SHORT = lib${LIB_CAROB}.so
-LIB_CAROB_LIB = ${LIB_CAROB_LIB_SHORT}.${LIB_MAJOR_VERSION}
-LIB_CAROB_STATIC = lib${LIB_CAROB}.a
+# TODO: implement LIB_CAROB_REALNAME and CAROB_MINOR_VERSION + move
+# both numbers to some external file
+
+# See "Shared Library Names" in
+# http://www.dwheeler.com/program-library/
+# Also:
+# http://fink.sourceforge.net/doc/porting/porting.en.html
+# http://godi.ocaml-programming.de/project-doc/finding_libraries.txt
+
+CAROB_MAJOR_VERSION = 1
+
+CAROB = carob
+LIB_CAROB_LINKNAME = lib${CAROB}.so
+LIB_CAROB_SONAME = ${LIB_CAROB_LINKNAME}.${CAROB_MAJOR_VERSION}
+LIB_CAROB_STATIC = lib${CAROB}.a
Index: carob/make-includes/gnu-linker.mk
diff -u carob/make-includes/gnu-linker.mk:1.5
carob/make-includes/gnu-linker.mk:1.6
--- carob/make-includes/gnu-linker.mk:1.5 Mon Jan 22 15:51:24 2007
+++ carob/make-includes/gnu-linker.mk Mon Jan 22 17:02:42 2007
@@ -3,7 +3,7 @@
SHARED_LDFLAGS += -shared
# passed from the compiler to the GNU linker using "-Xlinker" or alike
-SHARED_INDIRECT_LDFLAGS += -soname ${LIB_CAROB_LIB}
+SHARED_INDIRECT_LDFLAGS += -soname ${LIB_CAROB_SONAME}
# export-dynamic is useful for debugging (as a side-effect)
TEST_INDIRECT_LDFLAGS += -rpath .:${CAROB_ROOT} -export-dynamic
Index: carob/make-includes/main.mk
diff -u carob/make-includes/main.mk:1.8 carob/make-includes/main.mk:1.9
--- carob/make-includes/main.mk:1.8 Fri Jan 19 19:21:56 2007
+++ carob/make-includes/main.mk Mon Jan 22 17:02:42 2007
@@ -27,8 +27,9 @@
# Forward flags from the compiler to the linker
-# e.g. -soname ${LIB_CAROB_LIB}
-# becomes: -Xlinker -soname -Xlinker ${LIB_CAROB_LIB}
+# e.g. -soname ${LIB_CAROB_SONAME}
+# becomes: -Xlinker -soname -Xlinker ${LIB_CAROB_SONAME}
+# See useful references in defaults.mk
MK_LDFLAGS += ${INDIRECT_LDFLAGS:%=${LD_FORWARDER} %}
SHARED_LDFLAGS += ${SHARED_INDIRECT_LDFLAGS:%=${LD_FORWARDER} %}
Index: carob/test/GNUmakefile
diff -u carob/test/GNUmakefile:1.42 carob/test/GNUmakefile:1.43
--- carob/test/GNUmakefile:1.42 Mon Jan 22 16:12:00 2007
+++ carob/test/GNUmakefile Mon Jan 22 17:02:42 2007
@@ -30,7 +30,7 @@
# libcarob.1.dylib etc.
include ${MKINCLUDES}/defaults.mk
-LIB_CAROB_SO = ${CAROB_ROOT}/${LIB_CAROB_LIB}
+LIB_CAROB_SO = ${CAROB_ROOT}/${LIB_CAROB_SONAME}
LIB_CAROB_A = ${CAROB_ROOT}/${LIB_CAROB_STATIC}
# customization
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
