[complement-svn] SF.net SVN: complement: [1723] trunk/complement/explore/lib/janus

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

Revision: 1723
          http://complement.svn.sourceforge.net/complement/?rev=1723&view=rev
Author:   complement
Date:     2007-09-07 03:52:21 -0700 (Fri, 07 Sep 2007)

Log Message:
-----------
fix dirname, options

Modified Paths:
--------------
    trunk/complement/explore/lib/janus/Makefile
    trunk/complement/explore/lib/janus/ut/Makefile

Modified: trunk/complement/explore/lib/janus/Makefile
===================================================================
--- trunk/complement/explore/lib/janus/Makefile	2007-09-05 11:10:42 UTC (rev 1722)
+++ trunk/complement/explore/lib/janus/Makefile	2007-09-07 10:52:21 UTC (rev 1723)
@@ -29,17 +29,17 @@
 endif
 
 check-release-shared:	release-shared
-	$(MAKE) -C test release-shared
-	(cd test; ${OUTPUT_DIR}/ut_vtime) || exit 1
+	$(MAKE) -C ut release-shared
+	(cd ut; ${OUTPUT_DIR}/ut_vtime) || exit 1
 
 check-dbg-shared:	dbg-shared
-	$(MAKE) -C test dbg-shared
-	(cd test; ${OUTPUT_DIR_DBG}/ut_vtime) || exit 1
+	$(MAKE) -C ut dbg-shared
+	(cd ut; ${OUTPUT_DIR_DBG}/ut_vtime) || exit 1
 
 ifndef WITHOUT_STLPORT
 check-stldbg-shared:	stldbg-shared
-	$(MAKE) -C test stldbg-shared
-	(cd test; ${OUTPUT_DIR_STLDBG}/ut_vtime) || exit 1
+	$(MAKE) -C ut stldbg-shared
+	(cd ut; ${OUTPUT_DIR_STLDBG}/ut_vtime) || exit 1
 endif
 
 depend::

Modified: trunk/complement/explore/lib/janus/ut/Makefile
===================================================================
--- trunk/complement/explore/lib/janus/ut/Makefile	2007-09-05 11:10:42 UTC (rev 1722)
+++ trunk/complement/explore/lib/janus/ut/Makefile	2007-09-07 10:52:21 UTC (rev 1723)
@@ -12,13 +12,23 @@
 INCLUDES += -I${CoMT_INCLUDE_DIR} -I..
 DEFS += -D__FIT_EXAM
 
-LDFLAGS += -L${INSTALL_LIB_DIR}
-ifdef WITHOUT_STLPORT
-LDFLAGS += -Wl,-rpath=${INSTALL_LIB_DIR}
-else
-LDFLAGS += -Wl,-rpath=${INSTALL_LIB_DIR}:${STLPORT_LIB_DIR}
+LIBEXAM_DIR = ${CoMT_DIR}/lib/exam
+LIBXMT_DIR = ${CoMT_DIR}/lib/mt
+LIBSOCKIOS_DIR = ${CoMT_DIR}/lib/sockios
+LIBSTEM_DIR = ${CoMT_DIR}/lib/stem
+
+ifeq ($(OSNAME),linux)
+
+release-shared: LDSEARCH += -L${LIBEXAM_DIR}/${OUTPUT_DIR} -L$(LIBXMT_DIR)/${OUTPUT_DIR} -L$(LIBSOCKIOS_DIR)/${OUTPUT_DIR} -L$(LIBSTEM_DIR)/${OUTPUT_DIR} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR}:$(LIBXMT_DIR)/${OUTPUT_DIR}:${LIBSOCKIOS_DIR}/${OUTPUT_DIR}:${LIBSTEM_DIR}/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
+
+dbg-shared:     LDSEARCH += -L${LIBEXAM_DIR}/${OUTPUT_DIR_DBG} -L$(LIBXMT_DIR)/${OUTPUT_DIR_DBG} -L$(LIBSOCKIOS_DIR)/${OUTPUT_DIR_DBG} -L$(LIBSTEM_DIR)/${OUTPUT_DIR_DBG} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR_DBG}:$(LIBXMT_DIR)/${OUTPUT_DIR_DBG}:${LIBSOCKIOS_DIR}/${OUTPUT_DIR_DBG}:${LIBSTEM_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
+
+ifndef WITHOUT_STLPORT
+stldbg-shared:  LDSEARCH += -L${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG} -L$(LIBXMT_DIR)/${OUTPUT_DIR_STLDBG} -L$(LIBSOCKIOS_DIR)/${OUTPUT_DIR_STLDBG} -L$(LIBSTEM_DIR)/${OUTPUT_DIR_STLDBG} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG}:$(LIBXMT_DIR)/${OUTPUT_DIR_STLDBG}:${LIBSOCKIOS_DIR}/${OUTPUT_DIR_STLDBG}:${LIBSTEM_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
 endif
 
+endif
+
 release-shared: PROJECT_LIBS = -lxmt -lsockios -lstem -lexam
 dbg-shared:     PROJECT_LIBS = -lxmtg -lsockiosg -lstemg -lexamg
 ifndef WITHOUT_STLPORT


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