Date: Wednesday, March 21, 2007 @ 17:12:54
Author: marc
Path: /cvsroot/carob/carob
Modified: GNUmakefile (1.34 -> 1.35)
Added new INCLUDELINK symbolic link from include/carob to . (=include/)
-------------+
GNUmakefile | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
Index: carob/GNUmakefile
diff -u carob/GNUmakefile:1.34 carob/GNUmakefile:1.35
--- carob/GNUmakefile:1.34 Fri Mar 16 14:58:30 2007
+++ carob/GNUmakefile Wed Mar 21 17:12:53 2007
@@ -53,7 +53,8 @@
INCDIR = include
SRCDIR = src
-VERSIONHPP = include/CarobVersion.hpp
+VERSIONHPP = ${INCDIR}/CarobVersion.hpp
+INCLUDELINK = ${INCDIR}/${CAROB}
#Carob C++ lib
OBJS = ${SRCDIR}/Common.o\
@@ -111,11 +112,14 @@
DOC_HTML = ${DOC_OUT}/index.html
all: lib static
-lib: ${VERSIONHPP} ${LIB_CAROB_REALNAME}
-static: ${VERSIONHPP} ${LIB_CAROB_STATIC}
+lib: ${VERSIONHPP} ${INCLUDELINK} ${LIB_CAROB_REALNAME}
+static: ${VERSIONHPP} ${INCLUDELINK} ${LIB_CAROB_STATIC}
test: all
$(MAKE) -C test
+${INCLUDELINK}:
+ ${LN} . $@
+
${LIB_CAROB_REALNAME}: ${OBJS}
${CXX} ${CXXFLAGS} ${OBJS} ${SHARED_LDFLAGS} ${LDFLAGS} ${LDLIBS} -o
${LIB_CAROB_REALNAME}
- ${LN} -f ${LIB_CAROB_REALNAME} ${LIB_CAROB_SONAME}
@@ -128,7 +132,7 @@
./configure --clean
clean: clean-lib clean-test clean-doc clean-check
- ${RM} ${SRCDIR}/*.o ${VERSIONHPP}
+ ${RM} ${SRCDIR}/*.o ${VERSIONHPP} ${INCLUDELINK}
clean-lib:
${RM} ${LIB_CAROB_SONAME} ${LIB_CAROB_LINKNAME} ${LIB_CAROB_REALNAME}
${LIB_CAROB_STATIC}
clean-test:
@@ -143,7 +147,7 @@
install: lib static
@printf "Install manually like this:\n cp ./libcarob*
/usr/local/lib/\n"
@printf " cp ./include/*.hpp /usr/local/include/carob/\n"
- @printf "(you don't really need to install libcarob.a to use it)\n"
+ @printf "(you don't really need to install carob to use it)\n"
exit 1
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
