Date: Monday, November 14, 2005 @ 19:11:31
  Author: marc
    Path: /cvsroot/carob/carob

Modified: Makefile (1.12 -> 1.13)

replaced COMPILER by CXX and CFLAGS by CXXFLAGS


----------+
 Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Index: carob/Makefile
diff -u carob/Makefile:1.12 carob/Makefile:1.13
--- carob/Makefile:1.12 Mon Nov 14 18:51:38 2005
+++ carob/Makefile      Mon Nov 14 19:11:31 2005
@@ -26,7 +26,7 @@
 LIB_MAJOR_VERSION      = 1
 
 #Tools
-COMPILER                       = g++
+
 RM                                     = /bin/rm -f
 RMDIR                          = /bin/rm -rf
 LN                                     = /bin/ln -s
@@ -53,7 +53,7 @@
                                          ${SRCDIR}/Statement.o\
                                          ${SRCDIR}/BigDecimal.o\
                                          ${SRCDIR}/SQLDataSerialization.o
-CFLAGS                         = -g3 -Wall -I${INCDIR}
+CXXFLAGS                       = -g3 -Wall -I${INCDIR}
 LDFLAGS                                = -fPIC --shared -lpthread
 LIB_CAROB                      = carobcpp
 LIB_CAROB_LIB_SHORT = lib${LIB_CAROB}.so
@@ -73,12 +73,12 @@
        cd test && make
 
 ${LIB_CAROB_LIB}: ${OBJS}
-       ${COMPILER} ${LDFLAGS} -o ${LIB_CAROB_LIB} ${OBJS}
+       ${CXX} ${LDFLAGS} -o ${LIB_CAROB_LIB} ${OBJS}
        ${RM} ${LIB_CAROB_LIB_SHORT}
        ${LN} ${LIB_CAROB_LIB} ${LIB_CAROB_LIB_SHORT}
 
 %.o: %.cpp
-       ${COMPILER} $(CFLAGS) -o $@ -c $<
+       ${CXX} $(CXXFLAGS) -o $@ -c $<
 clean: clean-lib clean-test clean-doc
 clean-lib:
        ${RM} ${SRCDIR}/*.o ${LIB_CAROB_LIB} ${LIB_CAROB_LIB_SHORT}

_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits

Reply via email to