Date: Thursday, May 3, 2007 @ 15:31:39
Author: marc
Path: /cvsroot/carob/carob
Modified: GNUmakefile (1.39 -> 1.40)
OBJS is dynamically generated using wildcard function libcarob.*
targets explicitely depend on CarobVersion.hpp etc. (instead of
indirectly and unreliably)
-------------+
GNUmakefile | 36 ++++++++----------------------------
1 files changed, 8 insertions(+), 28 deletions(-)
Index: carob/GNUmakefile
diff -u carob/GNUmakefile:1.39 carob/GNUmakefile:1.40
--- carob/GNUmakefile:1.39 Thu May 3 15:06:01 2007
+++ carob/GNUmakefile Thu May 3 15:31:39 2007
@@ -57,30 +57,10 @@
INCLUDELINK = ${CAROB}
#Carob C++ lib
-OBJS = ${SRCDIR}/Common.o\
- ${SRCDIR}/JavaSocket.o\
- ${SRCDIR}/BufferedSocket.o\
- ${SRCDIR}/DriverSocket.o\
- ${SRCDIR}/CarobException.o\
- ${SRCDIR}/SocketAddress.o\
- ${SRCDIR}/ControllerInfo.o\
- ${SRCDIR}/ConnectionParameters.o\
- ${SRCDIR}/ControllerPool.o\
- ${SRCDIR}/Connection.o\
- ${SRCDIR}/Request.o\
- ${SRCDIR}/RequestWithResultSetParameters.o\
- ${SRCDIR}/ResultSetMetaData.o\
- ${SRCDIR}/DriverResultSet.o\
- ${SRCDIR}/Field.o\
- ${SRCDIR}/Statement.o\
- ${SRCDIR}/ParameterStatement.o\
- ${SRCDIR}/BigDecimal.o\
- ${SRCDIR}/SQLDataSerialization.o\
- ${SRCDIR}/StringCodecs.o\
- ${SRCDIR}/ControllerStateChangedCallback.o\
- ${SRCDIR}/WatchedControllers.o\
- ${SRCDIR}/ControllerPingSender.o\
- ${SRCDIR}/ControllerWatcher.o
+SRCS := $(wildcard ${SRCDIR}/*.cpp)
+OBJS := ${SRCS:.cpp=.o}
+
+
# _GLIBCXX_GTHREAD_USE_WEAK
override CPPFLAGS += -I${INCDIR}
@@ -118,8 +98,8 @@
all: lib static
endif
-lib: ${VERSIONHPP} ${INCLUDELINK} ${LIB_CAROB_REALNAME}
-static: ${VERSIONHPP} ${INCLUDELINK} ${LIB_CAROB_STATIC}
+lib: ${LIB_CAROB_REALNAME}
+static: ${LIB_CAROB_STATIC}
test: all
$(MAKE) -C test
@@ -130,12 +110,12 @@
# ${LN} include $@
# but eclipse CVS client is unfortunately totally confused by this
-${LIB_CAROB_REALNAME}: ${OBJS}
+${LIB_CAROB_REALNAME}: ${VERSIONHPP} ${INCLUDELINK} ${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}: ${OBJS}
+${LIB_CAROB_STATIC}: ${VERSIONHPP} ${INCLUDELINK} ${OBJS}
${AR} ${ARFLAGS} ${LIB_CAROB_STATIC} ${OBJS}
distclean: clean
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
