Date: Thursday, November 30, 2006 @ 21:12:33
Author: gilles
Path: /cvsroot/carob/carob
Modified: Makefile (1.50 -> 1.51)
(no change) fixed formatting by replacing tabs by spaces where possible
----------+
Makefile | 92 ++++++++++++++++++++++++++++++-------------------------------
1 files changed, 46 insertions(+), 46 deletions(-)
Index: carob/Makefile
diff -u carob/Makefile:1.50 carob/Makefile:1.51
--- carob/Makefile:1.50 Tue Nov 28 17:07:55 2006
+++ carob/Makefile Thu Nov 30 21:12:33 2006
@@ -23,78 +23,78 @@
#
#General
-LIB_MAJOR_VERSION = 1
+LIB_MAJOR_VERSION = 1
#Tools
-RM = /bin/rm -f
-RMDIR = /bin/rm -rf
-LN = /bin/ln -s
-DOXYGEN = /usr/bin/doxygen
+RM = /bin/rm -f
+RMDIR = /bin/rm -rf
+LN = /bin/ln -s
+DOXYGEN = /usr/bin/doxygen
#Dirs
-INCDIR = include
-SRCDIR = src
+INCDIR = include
+SRCDIR = src
#Carob C++ lib
-OBJS = ${SRCDIR}/Common.o\
- ${SRCDIR}/JavaSocket.o\
- ${SRCDIR}/DriverSocket.o\
- ${SRCDIR}/CarobException.o\
- ${SRCDIR}/ControllerInfo.o\
- ${SRCDIR}/ConnectionParameters.o\
- ${SRCDIR}/ControllerPool.o\
- ${SRCDIR}/Connection.o\
- ${SRCDIR}/Request.o\
-
${SRCDIR}/RequestWithResultSetParameters.o\
- ${SRCDIR}/ResultSetMetaData.o\
- ${SRCDIR}/DriverResultSet.o\
- ${SRCDIR}/Field.o\
- ${SRCDIR}/Statement.o\
- ${SRCDIR}/ParameterStatement.o\
- ${SRCDIR}/BigDecimal.o\
- ${SRCDIR}/SQLDataSerialization.o\
- ${SRCDIR}/StringCodecs.o\
-
${SRCDIR}/ControllerStateChangedCallback.o\
- ${SRCDIR}/WatchedControllers.o\
- ${SRCDIR}/ControllerPingSender.o\
- ${SRCDIR}/ControllerWatcher.o
+OBJS = ${SRCDIR}/Common.o\
+ ${SRCDIR}/JavaSocket.o\
+ ${SRCDIR}/DriverSocket.o\
+ ${SRCDIR}/CarobException.o\
+ ${SRCDIR}/ControllerInfo.o\
+ ${SRCDIR}/ConnectionParameters.o\
+ ${SRCDIR}/ControllerPool.o\
+ ${SRCDIR}/Connection.o\
+ ${SRCDIR}/Request.o\
+ ${SRCDIR}/RequestWithResultSetParameters.o\
+ ${SRCDIR}/ResultSetMetaData.o\
+ ${SRCDIR}/DriverResultSet.o\
+ ${SRCDIR}/Field.o\
+ ${SRCDIR}/Statement.o\
+ ${SRCDIR}/ParameterStatement.o\
+ ${SRCDIR}/BigDecimal.o\
+ ${SRCDIR}/SQLDataSerialization.o\
+ ${SRCDIR}/StringCodecs.o\
+ ${SRCDIR}/ControllerStateChangedCallback.o\
+ ${SRCDIR}/WatchedControllers.o\
+ ${SRCDIR}/ControllerPingSender.o\
+ ${SRCDIR}/ControllerWatcher.o
# _GLIBCXX_GTHREAD_USE_WEAK
# optional CXXFLAGS
-CXXFLAGS = -g3 -Wall -O0
+CXXFLAGS = -g3 -Wall -O0
# mandatory CXXFLAGS
-override CXXFLAGS += -I${INCDIR} -fPIC
+override CXXFLAGS += -I${INCDIR} -fPIC
# Uncomment this line to use select function instead of poll
# Or using the command line: make CXXFLAGS=-DCAROB_USE_SELECT
-# override CXXFLAGS += -DCAROB_USE_SELECT
+# override CXXFLAGS += -DCAROB_USE_SELECT
-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
+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
# LDFLAGS is not used for _static_ libcarob.a
# optional LDFLAGS
-LDFLAGS = -lpthread
+LDFLAGS = -lpthread
# mandatory LDFLAGS
-override LDFLAGS += -fPIC -shared -Wl,-soname,${LIB_CAROB_LIB}
+override LDFLAGS += -fPIC -shared -Wl,-soname,${LIB_CAROB_LIB}
# for GMP
-override LDFLAGS += -lgmp
+override LDFLAGS += -lgmp
-ARFLAGS = rcs
+ARFLAGS = rcs
# Uncomment these 2 lines to use log4cxx instead of internal logger
-#CXXFLAGS += -DCAROB_USE_LOG4CXX
-#LDFLAGS += -llog4cxx
+#CXXFLAGS += -DCAROB_USE_LOG4CXX
+#LDFLAGS += -llog4cxx
#Doc
# DOC_DIR is duplicated in Doxyfile
-DOC_DIR = doxygen
-DOC_OUT = ${DOC_DIR}/html
-DOXYFILE = ${DOC_DIR}/Doxyfile
-DOC_HTML = ${DOC_OUT}/index.html
+DOC_DIR = doxygen
+DOC_OUT = ${DOC_DIR}/html
+DOXYFILE = ${DOC_DIR}/Doxyfile
+DOC_HTML = ${DOC_OUT}/index.html
all: lib static
lib: ${LIB_CAROB_LIB}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
