Date: Friday, December 9, 2005 @ 10:56:03
Author: csaba
Path: /cvsroot/carob/libmysequoia
Modified: Makefile (1.13 -> 1.14) src/Makefile (1.3 -> 1.4)
Splitted the makefile in two.
--------------+
Makefile | 64 ++++++++++++++++++---------------------------------------
src/Makefile | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 78 insertions(+), 43 deletions(-)
Index: libmysequoia/Makefile
diff -u libmysequoia/Makefile:1.13 libmysequoia/Makefile:1.14
--- libmysequoia/Makefile:1.13 Thu Dec 8 18:22:43 2005
+++ libmysequoia/Makefile Fri Dec 9 10:56:02 2005
@@ -22,9 +22,6 @@
# Makefile for LibMySequoia and tests
#
-# General
-LIB_MAJOR_VERSION = 1
-
# Tools
RM = /bin/rm -f
@@ -33,21 +30,6 @@
LN = /bin/ln -s
DOXYGEN = /usr/bin/doxygen
-# Dirs
-INCDIR = -Iinclude -I../carob/include `mysql_config --include`
-SRCDIR = src
-
-# LibMySequoia C++ lib
-OBJS = ${SRCDIR}/CarobMySQL.o\
- ${SRCDIR}/MySQLAPI.o\
- ${SRCDIR}/Utils.o
-CXXFLAGS = -fprofile-arcs -ftest-coverage -g3 -O0 -Wall ${INCDIR}
-LDFLAGS = -fprofile-arcs -ftest-coverage -fPIC --shared -Wl,-rpath,../carob
-L../carob -lcarobcpp
-LIB_MYSEQUOIA = mysequoia
-LIB_MYSEQUOIA_LIB_SHORT = lib${LIB_MYSEQUOIA}.so
-LIB_MYSEQUOIA_LIB = ${LIB_MYSEQUOIA_LIB_SHORT}.${LIB_MAJOR_VERSION}
-
-
# Doc
# DOC_DIR is duplicated in Doxyfile
DOC_DIR = doc
@@ -55,36 +37,35 @@
DOXYFILE = ${DOC_DIR}/Doxyfile
DOC_HTML = ${DOC_OUT}/index.html
-all: lib
-
-lib: ${LIB_MYSEQUOIA_LIB}
+all: lib test
-test: all
+lib:
+ $(MAKE) -C src
+
+test: lib
$(MAKE) -C test
run: test
LD_LIBRARY_PATH=.:../carob test/runTests
+doc: ${DOC_HTML}
+ make -C ${DOC_DIR}/latex
+
+${DOC_HTML}: ${DOXYFILE}
+ ${DOXYGEN} ${DOXYFILE}
+
lcov: run
${RMDIR} coverage && ${MKDIR} coverage
- cd src && ${RM} src && ${LN} . src
- lcov -d . -z
- lcov -d . -c -o coverage/temp.info
- lcov -r coverage/temp.info '/usr/include/*' -o coverage/coverage.info
- cd coverage && genhtml coverage.info
- ${RM} ${SRCDIR}/src
+ lcov --directory . --zerocounters
+ lcov --directory . --capture --output-file coverage/temp.info
+ lcov --remove coverage/temp.info '/usr/include/*' --output-file
coverage/coverage.info
+ cd coverage && genhtml --prefix . --title "Native MySQL library"
coverage.info
cd coverage && firefox index.html
-${LIB_MYSEQUOIA_LIB}: ${OBJS}
- ${CXX} ${LDFLAGS} -o ${LIB_MYSEQUOIA_LIB} ${OBJS}
- ${RM} ${LIB_MYSEQUOIA_LIB_SHORT}
- ${LN} ${LIB_MYSEQUOIA_LIB} ${LIB_MYSEQUOIA_LIB_SHORT}
-
-clean: clean-lib clean-test clean-doc
-
-clean-lib:
- ${RM} ${SRCDIR}/*.o ${SRCDIR}/*.gcda ${SRCDIR}/*.gcno ${SRCDIR}/src
${LIB_MYSEQUOIA_LIB} ${LIB_MYSEQUOIA_LIB_SHORT}
- ${RMDIR} coverage
+clean: clean-src clean-test clean-doc clean-lcov
+
+clean-src:
+ $(MAKE) -C src clean
clean-test:
$(MAKE) -C test clean
@@ -92,8 +73,5 @@
clean-doc:
${RMDIR} ${DOC_OUT}
-doc: ${DOC_HTML}
- make -C ${DOC_DIR}/latex
-
-${DOC_HTML}: ${DOXYFILE}
- ${DOXYGEN} ${DOXYFILE}
+clean-lcov:
+ ${RMDIR} coverage
Index: libmysequoia/src/Makefile
diff -u /dev/null libmysequoia/src/Makefile:1.4
--- /dev/null Fri Dec 9 10:56:03 2005
+++ libmysequoia/src/Makefile Fri Dec 9 10:56:03 2005
@@ -0,0 +1,57 @@
+# Sequoia: Database clustering technology.
+# Copyright (C) 2005 Continuent, Inc.
+# Contact: [EMAIL PROTECTED]
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Initial developer(s): Zsolt Simon, Csaba Simon
+# Contributor(s):
+#
+# Makefile crafted from LibCarobCpp Makefile. Thanks Giles!
+#
+# Makefile for LibMySequoia and tests
+#
+
+# General
+LIB_MAJOR_VERSION = 1
+
+# Tools
+
+RM = /bin/rm -f
+RMDIR = /bin/rm -rf
+MKDIR = /bin/mkdir -p
+LN = /bin/ln -s
+
+# Dirs
+INCDIR = -I../include -I../../carob/include `mysql_config --include`
+
+# LibMySequoia C++ lib
+CXXFLAGS = -fprofile-arcs -ftest-coverage -g3 -O0 -Wall ${INCDIR}
+LDFLAGS = -fprofile-arcs -ftest-coverage -fPIC --shared -Wl,-rpath,../carob
-L../../carob -lcarobcpp
+LIB_MYSEQUOIA = mysequoia
+LIB_MYSEQUOIA_LIB_SHORT = lib${LIB_MYSEQUOIA}.so
+LIB_MYSEQUOIA_LIB = ${LIB_MYSEQUOIA_LIB_SHORT}.${LIB_MAJOR_VERSION}
+
+OBJS = CarobMySQL.o\
+ MySQLAPI.o\
+ Utils.o
+
+all: ../${LIB_MYSEQUOIA_LIB}
+
+../${LIB_MYSEQUOIA_LIB}: ${OBJS}
+ ${CXX} ${LDFLAGS} -o ../${LIB_MYSEQUOIA_LIB} ${OBJS}
+ ${RM} ../${LIB_MYSEQUOIA_LIB_SHORT}
+ cd .. && ${LN} ${LIB_MYSEQUOIA_LIB} ${LIB_MYSEQUOIA_LIB_SHORT}
+
+clean:
+ ${RM} ${OBJS} *.gcda *.gcno ../${LIB_MYSEQUOIA_LIB}
../${LIB_MYSEQUOIA_LIB_SHORT}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
