Date: Friday, March 23, 2007 @ 17:36:01
Author: marc
Path: /cvsroot/carob/carob
Modified: GNUmakefile (1.36 -> 1.37) make-includes/libmysequoia.mk (1.7 ->
1.8)
Implemented STATIC_ONLY toggle for CUSTOM=libmysequoia
-------------------------------+
GNUmakefile | 8 +++++++-
make-includes/libmysequoia.mk | 2 ++
2 files changed, 9 insertions(+), 1 deletion(-)
Index: carob/GNUmakefile
diff -u carob/GNUmakefile:1.36 carob/GNUmakefile:1.37
--- carob/GNUmakefile:1.36 Wed Mar 21 17:32:01 2007
+++ carob/GNUmakefile Fri Mar 23 17:36:01 2007
@@ -111,7 +111,13 @@
DOXYFILE = ${DOC_DIR}/Doxyfile
DOC_HTML = ${DOC_OUT}/index.html
+
+ifdef STATIC_ONLY
+all: static
+else
all: lib static
+endif
+
lib: ${VERSIONHPP} ${INCLUDELINK} ${LIB_CAROB_REALNAME}
static: ${VERSIONHPP} ${INCLUDELINK} ${LIB_CAROB_STATIC}
test: all
@@ -146,7 +152,7 @@
install: lib static
@printf "Install manually like this:\n sudo cp ./libcarob.*
/usr/local/lib/\n"
- @printf " sudo cp ./include/*.hpp /usr/local/include/carob/\n"
+ @printf " sudo mkdir /usr/local/include/carob ; sudo cp
./include/*.hpp /usr/local/include/carob/\n"
@printf "(you don't really need to install carob to use it)\n"
exit 1
Index: carob/make-includes/libmysequoia.mk
diff -u carob/make-includes/libmysequoia.mk:1.7
carob/make-includes/libmysequoia.mk:1.8
--- carob/make-includes/libmysequoia.mk:1.7 Fri Jan 19 11:31:44 2007
+++ carob/make-includes/libmysequoia.mk Fri Mar 23 17:36:01 2007
@@ -5,3 +5,5 @@
MK_CPPFLAGS += -DCAROB_LOG4CXX_NAME=LibMySequoia.CarobAPI -DCAROB_USE_ICONV
LDLIBS += -llog4cxx
+
+STATIC_ONLY = defined
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
