Date: Friday, March 16, 2007 @ 11:11:16
Author: marc
Path: /cvsroot/carob/carob/make-includes
Modified: defaults.mk (1.5 -> 1.6) main.mk (1.11 -> 1.12)
Moved (lib)carob.so(.x.y.z) definitions from defaults.mk to main.mk
-------------+
defaults.mk | 7 -------
main.mk | 9 +++++++++
2 files changed, 9 insertions(+), 7 deletions(-)
Index: carob/make-includes/defaults.mk
diff -u carob/make-includes/defaults.mk:1.5 carob/make-includes/defaults.mk:1.6
--- carob/make-includes/defaults.mk:1.5 Fri Mar 16 11:08:10 2007
+++ carob/make-includes/defaults.mk Fri Mar 16 11:11:16 2007
@@ -33,10 +33,3 @@
# TODO: include these numbers in the logs, probably thanks to some
# generated CarobVersion.hpp file
-
-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}${CAROB_DEV_STAGE}
-LIB_CAROB_STATIC = lib${CAROB}.a
-
Index: carob/make-includes/main.mk
diff -u carob/make-includes/main.mk:1.11 carob/make-includes/main.mk:1.12
--- carob/make-includes/main.mk:1.11 Fri Mar 9 18:16:03 2007
+++ carob/make-includes/main.mk Fri Mar 16 11:11:16 2007
@@ -20,6 +20,15 @@
#
+
+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}${CAROB_DEV_STAGE}
+LIB_CAROB_STATIC = lib${CAROB}.a
+
+
+
# Playing with overrides, declaration order and appending like this is
# too subtle and unreliable.
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
