Date: Friday, March 9, 2007 @ 18:16:03
Author: marc
Path: /cvsroot/carob/carob
Modified: GNUmakefile (1.26 -> 1.27) make-includes/main.mk (1.10 -> 1.11)
test/GNUmakefile (1.46 -> 1.47)
Implemented minimal ./configure based on "uname -s". Automatically
called by GNUMakefile for obvious compatibility reasons.
-----------------------+
GNUmakefile | 5 +++++
make-includes/main.mk | 2 --
test/GNUmakefile | 3 +++
3 files changed, 8 insertions(+), 2 deletions(-)
Index: carob/GNUmakefile
diff -u carob/GNUmakefile:1.26 carob/GNUmakefile:1.27
--- carob/GNUmakefile:1.26 Thu Mar 1 16:56:19 2007
+++ carob/GNUmakefile Fri Mar 9 18:16:03 2007
@@ -36,6 +36,8 @@
#### PORTABILITY - CUSTOMIZATIOM
+OS?=$(shell ./configure --getos)
+
MKINCLUDES=make-includes
# gives default names like: carob, libcarob, libcarob.so.1,
@@ -119,6 +121,9 @@
${LIB_CAROB_STATIC}: ${OBJS}
${AR} ${ARFLAGS} ${LIB_CAROB_STATIC} ${OBJS}
+distclean: clean
+ ./configure --clean
+
clean: clean-lib clean-test clean-doc clean-check
clean-lib:
${RM} ${SRCDIR}/*.o ${LIB_CAROB_SONAME} ${LIB_CAROB_LINKNAME}
${LIB_CAROB_STATIC}
Index: carob/make-includes/main.mk
diff -u carob/make-includes/main.mk:1.10 carob/make-includes/main.mk:1.11
--- carob/make-includes/main.mk:1.10 Fri Mar 9 18:07:15 2007
+++ carob/make-includes/main.mk Fri Mar 9 18:16:03 2007
@@ -31,8 +31,6 @@
# Defaults
COMPILER?=gcc
LINKER?=gnu
-OS?=linux
-
include ${MKINCLUDES}/${COMPILER}-compiler.mk
Index: carob/test/GNUmakefile
diff -u carob/test/GNUmakefile:1.46 carob/test/GNUmakefile:1.47
--- carob/test/GNUmakefile:1.46 Mon Feb 12 18:48:47 2007
+++ carob/test/GNUmakefile Fri Mar 9 18:16:03 2007
@@ -28,6 +28,9 @@
# gives default names like: carob, libcarob, libcarob.so.1,
# libcarob.1.dylib etc.
+
+OS?=$(shell cd .. && ./configure --getos)
+
include ${MKINCLUDES}/defaults.mk
LIB_CAROB_SO = ${CAROB_ROOT}/${LIB_CAROB_SONAME}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
