[complement-svn] SF.net SVN: complement: [1481] trunk/complement/explore
Status: Pre-Alpha
Brought to you by:
complement
Menu
▾
▴
[complement-svn] SF.net SVN: complement: [1481] trunk/complement/explore
|
From: <com...@us...> - 2007-01-26 15:43:51
|
Revision: 1481
http://svn.sourceforge.net/complement/?rev=1481&view=rev
Author: complement
Date: 2007-01-26 07:43:49 -0800 (Fri, 26 Jan 2007)
Log Message:
-----------
fix check-* targets; change link options to allow tests before install
Modified Paths:
--------------
trunk/complement/explore/lib/mt/Makefile
trunk/complement/explore/lib/sockios/Makefile
trunk/complement/explore/lib/stem/Makefile
trunk/complement/explore/test/mt/Makefile
trunk/complement/explore/test/sockios/Makefile
trunk/complement/explore/test/stem/Makefile
Modified: trunk/complement/explore/lib/mt/Makefile
===================================================================
--- trunk/complement/explore/lib/mt/Makefile 2007-01-26 13:58:54 UTC (rev 1480)
+++ trunk/complement/explore/lib/mt/Makefile 2007-01-26 15:43:49 UTC (rev 1481)
@@ -7,22 +7,22 @@
INCLUDES += -I$(SRCROOT)/include
-check: install
+check: all-shared
$(MAKE) -C ../../test/mt
(cd ../../test/mt; ${OUTPUT_DIR}/mt_ut) || exit 1
(cd ../../test/mt; ${OUTPUT_DIR_DBG}/mt_ut) || exit 1
(cd ../../test/mt; ${OUTPUT_DIR_STLDBG}/mt_ut) || exit 1
-check-release: install-release-shared
+check-release-shared: release-shared
$(MAKE) -C ../../test/mt release-shared
(cd ../../test/mt; ${OUTPUT_DIR}/mt_ut) || exit 1
-check-dbg: install-dbg-shared
+check-dbg-shared: dbg-shared
$(MAKE) -C ../../test/mt dbg-shared
(cd ../../test/mt; ${OUTPUT_DIR_DBG}/mt_ut) || exit 1
ifndef WITHOUT_STLPORT
-check-stldbg: install-stldbg-shared
+check-stldbg-shared: stldbg-shared
$(MAKE) -C ../../test/mt stldbg-shared
(cd ../../test/mt; ${OUTPUT_DIR_STLDBG}/mt_ut) || exit 1
endif
Modified: trunk/complement/explore/lib/sockios/Makefile
===================================================================
--- trunk/complement/explore/lib/sockios/Makefile 2007-01-26 13:58:54 UTC (rev 1480)
+++ trunk/complement/explore/lib/sockios/Makefile 2007-01-26 15:43:49 UTC (rev 1481)
@@ -8,22 +8,22 @@
INCLUDES += -I$(SRCROOT)/include
-check: install
+check: all-shared
$(MAKE) -C ../../test/sockios
(cd ../../test/sockios; ${OUTPUT_DIR}/sockios_ut) || exit 1
(cd ../../test/sockios; ${OUTPUT_DIR_DBG}/sockios_ut) || exit 1
(cd ../../test/sockios; ${OUTPUT_DIR_STLDBG}/sockios_ut) || exit 1
-check-release: install-release-shared
+check-release-shared: release-shared
$(MAKE) -C ../../test/sockios release-shared
(cd ../../test/sockios; ${OUTPUT_DIR}/sockios_ut) || exit 1
-check-dbg: install-dbg-shared
+check-dbg-shared: dbg-shared
$(MAKE) -C ../../test/sockios dbg-shared
(cd ../../test/sockios; ${OUTPUT_DIR_DBG}/sockios_ut) || exit 1
ifndef WITHOUT_STLPORT
-check-stldbg: install-stldbg-shared
+check-stldbg-shared: stldbg-shared
$(MAKE) -C ../../test/sockios stldbg-shared
(cd ../../test/sockios; ${OUTPUT_DIR_STLDBG}/sockios_ut) || exit 1
endif
Modified: trunk/complement/explore/lib/stem/Makefile
===================================================================
--- trunk/complement/explore/lib/stem/Makefile 2007-01-26 13:58:54 UTC (rev 1480)
+++ trunk/complement/explore/lib/stem/Makefile 2007-01-26 15:43:49 UTC (rev 1481)
@@ -16,22 +16,22 @@
stldbg-shared: DEFS += -D__FIT_STEM_TRACE=1
endif
-check: install
+check: all-shared
$(MAKE) -C ../../test/stem
(cd ../../test/stem; ${OUTPUT_DIR}/stem_ut) || exit 1
(cd ../../test/stem; ${OUTPUT_DIR_DBG}/stem_ut) || exit 1
(cd ../../test/stem; ${OUTPUT_DIR_STLDBG}/stem_ut) || exit 1
-check-release: install-release-shared
+check-release-shared: release-shared
$(MAKE) -C ../../test/stem release-shared
(cd ../../test/stem; ${OUTPUT_DIR}/stem_ut) || exit 1
-check-dbg: install-dbg-shared
+check-dbg-shared: dbg-shared
$(MAKE) -C ../../test/stem dbg-shared
(cd ../../test/stem; ${OUTPUT_DIR_DBG}/stem_ut) || exit 1
ifndef WITHOUT_STLPORT
-check-stldbg: install-stldbg-shared
+check-stldbg-shared: stldbg-shared
$(MAKE) -C ../../test/stem stldbg-shared
(cd ../../test/stem; ${OUTPUT_DIR_STLDBG}/stem_ut) || exit 1
endif
Modified: trunk/complement/explore/test/mt/Makefile
===================================================================
--- trunk/complement/explore/test/mt/Makefile 2007-01-26 13:58:54 UTC (rev 1480)
+++ trunk/complement/explore/test/mt/Makefile 2007-01-26 15:43:49 UTC (rev 1481)
@@ -17,16 +17,20 @@
# RPATH := ${RPATH}:$(realpath ${STLPORT_LIB_DIR}):$(realpath /usr/lib)
# endif
+LIBMT_DIR = ${CoMT_DIR}/lib/mt
+LIBUTF_DIR = ${CoMT_DIR}/../extern/custom/boost/libs/test/unit_test_framework
+LIBFS_DIR = ${CoMT_DIR}/../extern/custom/boost/libs/filesystem
+
ifeq ($(OSNAME),linux)
-release-shared: LDSEARCH += -L${CoMT_LIB_DIR} -Wl,--rpath=${CoMT_LIB_DIR}:${STLPORT_LIB_DIR}
-stldbg-shared: LDSEARCH += -L${CoMT_LIB_DIR_STLDBG} -Wl,--rpath=${CoMT_LIB_DIR_STLDBG}:${STLPORT_LIB_DIR}
-dbg-shared: LDSEARCH += -L${CoMT_LIB_DIR_DBG} -Wl,--rpath=${CoMT_LIB_DIR_DBG}:${STLPORT_LIB_DIR}
+release-shared: LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR} -L${LIBUTF_DIR}/${OUTPUT_DIR} -L${LIBFS_DIR}/${OUTPUT_DIR} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR}:${LIBUTF_DIR}/${OUTPUT_DIR}:${LIBFS_DIR}/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
+stldbg-shared: LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBUTF_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBFS_DIR}/${OUTPUT_DIR_STLDBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_STLDBG}:${LIBUTF_DIR}/${OUTPUT_DIR_STLDBG}:${LIBFS_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
+dbg-shared: LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR_DBG} -L${LIBUTF_DIR}/${OUTPUT_DIR_DBG} -L${LIBFS_DIR}/${OUTPUT_DIR_DBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_DBG}:${LIBUTF_DIR}/${OUTPUT_DIR_DBG}:${LIBFS_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
endif
ifeq ($(OSNAME),openbsd)
-release-shared: LDSEARCH += -L${CoMT_LIB_DIR} -Wl,-R${CoMT_LIB_DIR}:${STLPORT_LIB_DIR}
-stldbg-shared: LDSEARCH += -L${CoMT_LIB_DIR_STLDBG} -Wl,-R${CoMT_LIB_DIR_STLDBG}:${STLPORT_LIB_DIR}
-dbg-shared: LDSEARCH += -L${CoMT_LIB_DIR_DBG} -Wl,-R${CoMT_LIB_DIR_DBG}:${STLPORT_LIB_DIR}
+release-shared: LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR} -Wl,-R${LIBMT_DIR}/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
+stldbg-shared: LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR_STLDBG} -Wl,-R${LIBMT_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
+dbg-shared: LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR_DBG} -Wl,-R${LIBMT_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
endif
release-shared : LDLIBS = -lxmt -lboost_test_utf -lboost_fs
Modified: trunk/complement/explore/test/sockios/Makefile
===================================================================
--- trunk/complement/explore/test/sockios/Makefile 2007-01-26 13:58:54 UTC (rev 1480)
+++ trunk/complement/explore/test/sockios/Makefile 2007-01-26 15:43:49 UTC (rev 1481)
@@ -9,10 +9,16 @@
INCLUDES += -I$(SRCROOT)/include -I$(BOOST_INCLUDE_DIR)
-LDSEARCH += -L${CoMT_LIB_DIR}
+LIBMT_DIR = ${CoMT_DIR}/lib/mt
+LIBSOCK_DIR = ${CoMT_DIR}/lib/sockios
+LIBUTF_DIR = ${CoMT_DIR}/../extern/custom/boost/libs/test/unit_test_framework
+ifeq ($(OSNAME),linux)
+release-shared: LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR} -L${LIBUTF_DIR}/${OUTPUT_DIR} -L${LIBSOCK_DIR}/${OUTPUT_DIR} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR}:${LIBUTF_DIR}/${OUTPUT_DIR}:${LIBSOCK_DIR}/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
+stldbg-shared: LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBUTF_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBSOCK_DIR}/${OUTPUT_DIR_STLDBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_STLDBG}:${LIBUTF_DIR}/${OUTPUT_DIR_STLDBG}:${LIBSOCK_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
+dbg-shared: LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR_DBG} -L${LIBUTF_DIR}/${OUTPUT_DIR_DBG} -L${LIBSOCK_DIR}/${OUTPUT_DIR_DBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_DBG}:${LIBUTF_DIR}/${OUTPUT_DIR_DBG}:${LIBSOCK_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
+endif
+
release-shared : LDLIBS = -lxmt -lsockios -lboost_test_utf
stldbg-shared : LDLIBS = -lxmtstlg -lsockiosstlg -lboost_test_utfstlg
dbg-shared : LDLIBS = -lxmtg -lsockiosg -lboost_test_utfg
-
-LDFLAGS += -Wl,-rpath=${STLPORT_LIB_DIR}:${CoMT_LIB_DIR}
Modified: trunk/complement/explore/test/stem/Makefile
===================================================================
--- trunk/complement/explore/test/stem/Makefile 2007-01-26 13:58:54 UTC (rev 1480)
+++ trunk/complement/explore/test/stem/Makefile 2007-01-26 15:43:49 UTC (rev 1481)
@@ -10,19 +10,25 @@
include Makefile.inc
include ${SRCROOT}/Makefiles/top.mak
-
INCLUDES += -I$(SRCROOT)/include -I$(BOOST_INCLUDE_DIR)
-LDSEARCH = -L${STLPORT_LIB_DIR} -L${CoMT_LIB_DIR}
+LIBMT_DIR = ${CoMT_DIR}/lib/mt
+LIBSOCK_DIR = ${CoMT_DIR}/lib/sockios
+LIBSTEM_DIR = ${CoMT_DIR}/lib/stem
+LIBUTF_DIR = ${CoMT_DIR}/../extern/custom/boost/libs/test/unit_test_framework
+ifeq ($(OSNAME),linux)
+release-shared: LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR} -L${LIBUTF_DIR}/${OUTPUT_DIR} -L${LIBSOCK_DIR}/${OUTPUT_DIR} -L${LIBSTEM_DIR}/${OUTPUT_DIR} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR}:${LIBUTF_DIR}/${OUTPUT_DIR}:${LIBSOCK_DIR}/${OUTPUT_DIR}:${LIBSTEM_DIR}/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
+stldbg-shared: LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBUTF_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBSOCK_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBSTEM_DIR}/${OUTPUT_DIR_STLDBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_STLDBG}:${LIBUTF_DIR}/${OUTPUT_DIR_STLDBG}:${LIBSOCK_DIR}/${OUTPUT_DIR_STLDBG}:${LIBSTEM_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
+dbg-shared: LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR_DBG} -L${LIBUTF_DIR}/${OUTPUT_DIR_DBG} -L${LIBSOCK_DIR}/${OUTPUT_DIR_DBG} -L${LIBSTEM_DIR}/${OUTPUT_DIR_DBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_DBG}:${LIBUTF_DIR}/${OUTPUT_DIR_DBG}:${LIBSOCK_DIR}/${OUTPUT_DIR_DBG}:${LIBSTEM_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
+endif
+
release-shared : LDLIBS = -lxmt -lsockios -lstem -lboost_test_utf -ldl
stldbg-shared : LDLIBS = -lxmtstlg -lsockiosstlg -lstemstlg -lboost_test_utfstlg -ldl
dbg-shared : LDLIBS = -lxmtg -lsockiosg -lstemg -lboost_test_utfg -ldl
dbg-shared: DEFS += -DDEBUG
-LDFLAGS += -Wl,-rpath=${STLPORT_LIB_DIR}:${CoMT_LIB_DIR}
-
PHONY += dl dl-dbg dl-stldbg
dl:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
