Date: Wednesday, January 17, 2007 @ 10:58:27
Author: marc
Path: /cvsroot/carob/carob
Modified: GNUmakefile (1.18 -> 1.19)
introduced ${LDD}. Moved tools definition before include main.mk to allow
redefinitions
-------------+
GNUmakefile | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
Index: carob/GNUmakefile
diff -u carob/GNUmakefile:1.18 carob/GNUmakefile:1.19
--- carob/GNUmakefile:1.18 Mon Jan 8 21:04:33 2007
+++ carob/GNUmakefile Wed Jan 17 10:58:27 2007
@@ -22,11 +22,6 @@
# Makefile for the Carob C++ API and tests
#
-#### PORTABILITY - CUSTOMIZATIOM
-
-MKINCLUDES=make-includes
-
-include ${MKINCLUDES}/main.mk
#General
LIB_MAJOR_VERSION = 1
@@ -37,6 +32,17 @@
RMDIR = /bin/rm -rf
LN = /bin/ln -s
DOXYGEN = /usr/bin/doxygen
+LDD = ldd
+
+ARFLAGS = rcs
+
+
+#### PORTABILITY - CUSTOMIZATIOM
+
+MKINCLUDES=make-includes
+include ${MKINCLUDES}/main.mk
+
+
#Dirs
INCDIR = include
@@ -89,7 +95,6 @@
-ARFLAGS = rcs
# Uncomment these 2 lines to use log4cxx instead of internal logger
#CXXFLAGS += -DCAROB_LOG4CXX_NAME=CarobLogs
#LDFLAGS += -llog4cxx
@@ -145,11 +150,11 @@
# Useful to detect unresolved symbols in our lib
checklib: ${LIB_CAROB_LIB}
- ${CXX} ${CXXFLAGS} ${CPPFLAGS} dummymain.cpp $< ${CLIENT_LDLIBS} -o $@
- ldd ./$<
+ ${LDD} ./$<
checkstatic: ${LIB_CAROB_STATIC}
${CXX} ${CXXFLAGS} ${CPPFLAGS} dummymain.cpp $< ${LDFLAGS} ${LDLIBS}
${CLIENT_LDLIBS} -o $@
- ldd ./$@
+ ${LDD} ./$@
########### DIST ##################
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
