Date: Thursday, May 3, 2007 @ 15:06:01
Author: marc
Path: /cvsroot/carob/carob
Modified: GNUmakefile (1.38 -> 1.39)
Workaround for Eclipse CVS client confusion wrt symbolic links: now
painfully linking every carob/*.hpp file
-------------+
GNUmakefile | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
Index: carob/GNUmakefile
diff -u carob/GNUmakefile:1.38 carob/GNUmakefile:1.39
--- carob/GNUmakefile:1.38 Fri Mar 23 19:07:31 2007
+++ carob/GNUmakefile Thu May 3 15:06:01 2007
@@ -123,8 +123,12 @@
test: all
$(MAKE) -C test
-${INCLUDELINK}:
- ${LN} include $@
+${INCLUDELINK}: ${VERSIONHPP}
+ - mkdir $@
+ cd include && for h in *.h *.hpp; do test -L ../$@/$$h || ${LN}
../include/$$h ../$@/$$h; done
+# we would prefer to just symlink the directory
+# ${LN} include $@
+# but eclipse CVS client is unfortunately totally confused by this
${LIB_CAROB_REALNAME}: ${OBJS}
${CXX} ${CXXFLAGS} ${OBJS} ${SHARED_LDFLAGS} ${LDFLAGS} ${LDLIBS} -o
${LIB_CAROB_REALNAME}
@@ -135,10 +139,12 @@
${AR} ${ARFLAGS} ${LIB_CAROB_STATIC} ${OBJS}
distclean: clean
- ./configure --clean
+ ${RM} ${INCLUDELINK}/*
+ - rmdir carob
+ - ./configure --clean
clean: clean-lib clean-test clean-doc clean-check
- ${RM} ${SRCDIR}/*.o ${VERSIONHPP} ${INCLUDELINK}
+ ${RM} ${SRCDIR}/*.o ${VERSIONHPP}
clean-lib:
${RM} ${LIB_CAROB_SONAME} ${LIB_CAROB_LINKNAME} ${LIB_CAROB_REALNAME}
${LIB_CAROB_STATIC}
clean-test:
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits