[complement-svn] SF.net SVN: complement: [1667] trunk/complement/explore

[<com...@us...>]

Revision: 1667
          http://complement.svn.sourceforge.net/complement/?rev=1667&view=rev
Author:   complement
Date:     2007-08-03 07:08:20 -0700 (Fri, 03 Aug 2007)

Log Message:
-----------
fix targets for case without STLport; fix typo

Modified Paths:
--------------
    trunk/complement/explore/lib/stem/Makefile
    trunk/complement/explore/test/sockios/Makefile
    trunk/complement/explore/test/stem/Makefile
    trunk/complement/explore/test/stem/unit_test.cc

Modified: trunk/complement/explore/lib/stem/Makefile
===================================================================
--- trunk/complement/explore/lib/stem/Makefile	2007-08-03 13:53:54 UTC (rev 1666)
+++ trunk/complement/explore/lib/stem/Makefile	2007-08-03 14:08:20 UTC (rev 1667)
@@ -10,8 +10,6 @@
 dbg-shared:	DEFS += -D__FIT_STEM_TRACE=1
 
 ifndef WITHOUT_STLPORT
-# INCLUDES += -I${BOOST_INCLUDE_DIR}
-# else
 stldbg-shared:	DEFS += -D__FIT_STEM_TRACE=1
 endif
 
@@ -19,7 +17,9 @@
 	$(MAKE) -C ../../test/stem
 	(cd ../../test/stem; ${OUTPUT_DIR}/stem_ut) || exit 1
 	(cd ../../test/stem; ${OUTPUT_DIR_DBG}/stem_ut) || exit 1
+ifndef WITHOUT_STLPORT
 	(cd ../../test/stem; ${OUTPUT_DIR_STLDBG}/stem_ut) || exit 1
+endif
 
 check-release-shared:	release-shared
 	$(MAKE) -C ../../test/stem release-shared

Modified: trunk/complement/explore/test/sockios/Makefile
===================================================================
--- trunk/complement/explore/test/sockios/Makefile	2007-08-03 13:53:54 UTC (rev 1666)
+++ trunk/complement/explore/test/sockios/Makefile	2007-08-03 14:08:20 UTC (rev 1667)
@@ -1,13 +1,15 @@
 # -*- Makefile -*- Time-stamp: <07/07/18 08:44:04 ptr>
 
 SRCROOT := ../..
-COMPILER_NAME := gcc
 
 include Makefile.inc
 include ${SRCROOT}/Makefiles/gmake/top.mak
 
 
-INCLUDES += -I$(SRCROOT)/include -I$(BOOST_INCLUDE_DIR)
+INCLUDES += -I$(SRCROOT)/include
+ifdef BOOST_DIR
+INCLUDES += -I$(BOOST_INCLUDE_DIR)
+endif
 DEFS += -D__FIT_EXAM
 
 LIBMT_DIR = ${CoMT_DIR}/lib/mt
@@ -17,10 +19,14 @@
 
 ifeq ($(OSNAME),linux)
 release-shared:	LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR} -L${LIBEXAM_DIR}/${OUTPUT_DIR} -L${LIBSOCK_DIR}/${OUTPUT_DIR} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR}:${LIBEXAM_DIR}/${OUTPUT_DIR}:${LIBSOCK_DIR}/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
+ifndef WITHOUT_STLPORT
 stldbg-shared:	LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBSOCK_DIR}/${OUTPUT_DIR_STLDBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_STLDBG}:${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG}:${LIBSOCK_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
+endif
 dbg-shared:	LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR_DBG} -L${LIBEXAM_DIR}/${OUTPUT_DIR_DBG} -L${LIBSOCK_DIR}/${OUTPUT_DIR_DBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_DBG}:${LIBEXAM_DIR}/${OUTPUT_DIR_DBG}:${LIBSOCK_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
 endif
 
 release-shared : LDLIBS = -lxmt -lsockios -lexam
+ifndef WITHOUT_STLPORT
 stldbg-shared  : LDLIBS = -lxmtstlg -lsockiosstlg -lexamstlg
+endif
 dbg-shared     : LDLIBS = -lxmtg -lsockiosg -lexamg

Modified: trunk/complement/explore/test/stem/Makefile
===================================================================
--- trunk/complement/explore/test/stem/Makefile	2007-08-03 13:53:54 UTC (rev 1666)
+++ trunk/complement/explore/test/stem/Makefile	2007-08-03 14:08:20 UTC (rev 1667)
@@ -1,7 +1,6 @@
 # -*- Makefile -*- Time-stamp: <07/02/07 12:28:46 ptr>
 
 SRCROOT := ../..
-COMPILER_NAME := gcc
 
 EXTRA_POST := dl-rel
 EXTRA_POST_DBG := dl-dbg
@@ -20,12 +19,16 @@
 
 ifeq ($(OSNAME),linux)
 release-shared:	LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR} -L${LIBEXAM_DIR}/${OUTPUT_DIR} -L${LIBSOCK_DIR}/${OUTPUT_DIR} -L${LIBSTEM_DIR}/${OUTPUT_DIR} -Wl,--rpath=./dl/${OUTPUT_DIR}:${LIBMT_DIR}/${OUTPUT_DIR}:${LIBEXAM_DIR}/${OUTPUT_DIR}:${LIBSOCK_DIR}/${OUTPUT_DIR}:${LIBSTEM_DIR}/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
+ifndef WITHOUT_STLPORT
 stldbg-shared:  LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBSOCK_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBSTEM_DIR}/${OUTPUT_DIR_STLDBG} -Wl,--rpath=./dl/${OUTPUT_DIR_STLDBG}:${LIBMT_DIR}/${OUTPUT_DIR_STLDBG}:${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG}:${LIBSOCK_DIR}/${OUTPUT_DIR_STLDBG}:${LIBSTEM_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
+endif
 dbg-shared:     LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR_DBG} -L${LIBEXAM_DIR}/${OUTPUT_DIR_DBG} -L${LIBSOCK_DIR}/${OUTPUT_DIR_DBG} -L${LIBSTEM_DIR}/${OUTPUT_DIR_DBG} -Wl,--rpath=./dl/${OUTPUT_DIR_DBG}:${LIBMT_DIR}/${OUTPUT_DIR_DBG}:${LIBEXAM_DIR}/${OUTPUT_DIR_DBG}:${LIBSOCK_DIR}/${OUTPUT_DIR_DBG}:${LIBSTEM_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
 endif
 
 release-shared : LDLIBS = -lxmt -lsockios -lstem -lexam -ldl
+ifndef WITHOUT_STLPORT
 stldbg-shared  : LDLIBS = -lxmtstlg -lsockiosstlg -lstemstlg -lexamstlg -ldl
+endif
 dbg-shared     : LDLIBS = -lxmtg -lsockiosg -lstemg -lexamg -ldl
 
 # dbg-shared:	DEFS += -DDEBUG

Modified: trunk/complement/explore/test/stem/unit_test.cc
===================================================================
--- trunk/complement/explore/test/stem/unit_test.cc	2007-08-03 13:53:54 UTC (rev 1666)
+++ trunk/complement/explore/test/stem/unit_test.cc	2007-08-03 14:08:20 UTC (rev 1667)
@@ -805,7 +805,7 @@
 {
   exam::test_suite::test_case_type tc[4];
 
-  exam::test_suite t( "libsteam test suite" );
+  exam::test_suite t( "libstem test suite" );
   stem_test test;
 
   tc[1] = t.add( &stem_test::basic2, test, "basic2",


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.