Date: Thursday, May 3, 2007 @ 16:10:25
Author: marc
Path: /cvsroot/carob/carob
Modified: GNUmakefile (1.41 -> 1.42)
To link carob/*.hpp, now using a static pattern instead of a for loop
-------------+
GNUmakefile | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
Index: carob/GNUmakefile
diff -u carob/GNUmakefile:1.41 carob/GNUmakefile:1.42
--- carob/GNUmakefile:1.41 Thu May 3 15:36:57 2007
+++ carob/GNUmakefile Thu May 3 16:10:25 2007
@@ -60,6 +60,10 @@
SRCS := $(wildcard ${SRCDIR}/*.cpp)
OBJS := ${SRCS:.cpp=.o}
+# sort only to remove ${VERSIONHPP} duplicated sometimes
+HPPS = $(sort ${VERSIONHPP} $(wildcard ${INCDIR}/*.hpp) $(wildcard
${INCDIR}/*.h))
+LINKEDHPPS := ${HPPS:${INCDIR}/%=${INCLUDELINK}/%}
+
# _GLIBCXX_GTHREAD_USE_WEAK
@@ -77,9 +81,6 @@
-
-
-
# Uncomment these 2 lines to use log4cxx instead of internal logger
#CXXFLAGS += -DCAROB_LOG4CXX_NAME=CarobLogs
#LDFLAGS += -llog4cxx
@@ -103,19 +104,21 @@
test: all
$(MAKE) -C test
-${INCLUDELINK}: ${VERSIONHPP}
- - mkdir $@
- cd ${INCDIR} && for h in *.h *.hpp; do test -L ../$@/$$h || ${LN}
../${INCDIR}/$$h ../$@/$$h; done
+${INCLUDELINK}:
+ mkdir $@
+
+${LINKEDHPPS}: ${INCLUDELINK}/%: ${INCLUDELINK} ${INCDIR}/%
+ @test -L $@ || ${LN} ../${INCDIR}/$* $@
# we would prefer to just symlink the directory
# ${LN} include $@
# but eclipse CVS client is unfortunately totally confused by this
-${LIB_CAROB_REALNAME}: ${VERSIONHPP} ${INCLUDELINK} ${OBJS}
+${LIB_CAROB_REALNAME}: ${VERSIONHPP} ${LINKEDHPPS} ${OBJS}
${CXX} ${CXXFLAGS} ${OBJS} ${SHARED_LDFLAGS} ${LDFLAGS} ${LDLIBS} -o
${LIB_CAROB_REALNAME}
- ${LN} -f ${LIB_CAROB_REALNAME} ${LIB_CAROB_SONAME}
- ${LN} -f ${LIB_CAROB_REALNAME} ${LIB_CAROB_LINKNAME}
-${LIB_CAROB_STATIC}: ${VERSIONHPP} ${INCLUDELINK} ${OBJS}
+${LIB_CAROB_STATIC}: ${VERSIONHPP} ${LINKEDHPPS} ${OBJS}
${AR} ${ARFLAGS} ${LIB_CAROB_STATIC} ${OBJS}
distclean: clean
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
