[complement-svn] SF.net SVN: complement: [1906] branches/complement-sockios/explore
Status: Pre-Alpha
Brought to you by:
complement
Menu
▾
▴
[complement-svn] SF.net SVN: complement: [1906] branches/complement-sockios/explore
|
From: <com...@us...> - 2008-06-26 05:42:46
|
Revision: 1906
http://complement.svn.sourceforge.net/complement/?rev=1906&view=rev
Author: complement
Date: 2008-06-25 22:42:44 -0700 (Wed, 25 Jun 2008)
Log Message:
-----------
Remove LDSEARCH macro; add option for STLport includes in configure
Modified Paths:
--------------
branches/complement-sockios/explore/Makefiles/gmake/app/gcc.mak
branches/complement-sockios/explore/Makefiles/gmake/app/top.mak
branches/complement-sockios/explore/Makefiles/gmake/extern.mak
branches/complement-sockios/explore/Makefiles/gmake/icc.mak
branches/complement-sockios/explore/Makefiles/gmake/lib/CC.mak
branches/complement-sockios/explore/Makefiles/gmake/lib/aCC.mak
branches/complement-sockios/explore/Makefiles/gmake/lib/gcc.mak
branches/complement-sockios/explore/Makefiles/gmake/lib/icc.mak
branches/complement-sockios/explore/Makefiles/gmake/lib/vc6.mak
branches/complement-sockios/explore/configure
branches/complement-sockios/explore/lib/DB/PgSQL/Makefile
branches/complement-sockios/explore/lib/exam/ut/Makefile
branches/complement-sockios/explore/lib/janus/Makefile
branches/complement-sockios/explore/lib/janus/ut/Makefile
branches/complement-sockios/explore/lib/misc/ut/Makefile
branches/complement-sockios/explore/lib/mt/ut/Makefile
branches/complement-sockios/explore/lib/net/samples/httpclient/Makefile
branches/complement-sockios/explore/lib/net/ut/Makefile
branches/complement-sockios/explore/lib/sockios/perf/Makefile
branches/complement-sockios/explore/lib/sockios/ut/Makefile
branches/complement-sockios/explore/lib/stem/ut/Makefile
branches/complement-sockios/explore/lib/stem/ut/dl/Makefile
Removed Paths:
-------------
branches/complement-sockios/explore/lib/mt/Makefile.mwccnlm
branches/complement-sockios/explore/lib/mt/gcc-libstd.mak
branches/complement-sockios/explore/lib/mt/mwccnlm.mak
branches/complement-sockios/explore/lib/mt/ut/gcc-libstd.mak
Modified: branches/complement-sockios/explore/Makefiles/gmake/app/gcc.mak
===================================================================
--- branches/complement-sockios/explore/Makefiles/gmake/app/gcc.mak 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/Makefiles/gmake/app/gcc.mak 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,4 +1,4 @@
-# -*- Makefile -*- Time-stamp: <07/05/30 23:54:39 ptr>
+# -*- Makefile -*- Time-stamp: <08/06/12 13:54:55 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
@@ -62,14 +62,21 @@
endif
ifndef WITHOUT_STLPORT
-LDSEARCH += -L${STLPORT_LIB_DIR}
-
+ifeq (${STLPORT_LIB_DIR},)
release-shared: STLPORT_LIB = -lstlport
release-static: STLPORT_LIB = -Wl,-Bstatic -lstlport -Wl,-Bdynamic
dbg-shared: STLPORT_LIB = -lstlportg
dbg-static: STLPORT_LIB = -Wl,-Bstatic -lstlportg -Wl,-Bdynamic
stldbg-shared: STLPORT_LIB = -lstlportstlg
stldbg-static: STLPORT_LIB = -Wl,-Bstatic -lstlportstlg -Wl,-Bdynamic
+else
+release-shared: STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlport
+release-static: STLPORT_LIB = -L${STLPORT_LIB_DIR} -Wl,-Bstatic -lstlport -Wl,-Bdynamic
+dbg-shared: STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlportg
+dbg-static: STLPORT_LIB = -L${STLPORT_LIB_DIR} -Wl,-Bstatic -lstlportg -Wl,-Bdynamic
+stldbg-shared: STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlportstlg
+stldbg-static: STLPORT_LIB = -L${STLPORT_LIB_DIR} -Wl,-Bstatic -lstlportstlg -Wl,-Bdynamic
+endif
ifeq ($(OSNAME),windows)
LIB_VERSION = ${LIBMAJOR}.${LIBMINOR}
Modified: branches/complement-sockios/explore/Makefiles/gmake/app/top.mak
===================================================================
--- branches/complement-sockios/explore/Makefiles/gmake/app/top.mak 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/Makefiles/gmake/app/top.mak 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,6 +1,6 @@
-# -*- makefile -*- Time-stamp: <07/06/08 23:35:09 ptr>
+# -*- makefile -*- Time-stamp: <08/06/12 13:55:47 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2008
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -31,8 +31,6 @@
$(foreach prg,$(PRGNAMES),$(eval $(call prog_prog,$(prg))))
-LDFLAGS += ${LDSEARCH}
-
include ${RULESBASE}/gmake/app/${COMPILER_NAME}.mak
include ${RULESBASE}/gmake/app/rules.mak
include ${RULESBASE}/gmake/app/rules-install.mak
Modified: branches/complement-sockios/explore/Makefiles/gmake/extern.mak
===================================================================
--- branches/complement-sockios/explore/Makefiles/gmake/extern.mak 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/Makefiles/gmake/extern.mak 2008-06-26 05:42:44 UTC (rev 1906)
@@ -31,10 +31,12 @@
# STLport library
ifndef STLPORT_DIR
+ifndef STLPORT_INCLUDE_DIR
ifndef WITHOUT_STLPORT
WITHOUT_STLPORT = 1
endif
endif
+endif
ifdef STLPORT_DIR
STLPORT_LIB_DIR ?= $(STLPORT_DIR)/${TARGET_NAME}lib
Modified: branches/complement-sockios/explore/Makefiles/gmake/icc.mak
===================================================================
--- branches/complement-sockios/explore/Makefiles/gmake/icc.mak 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/Makefiles/gmake/icc.mak 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,6 +1,6 @@
-# Time-stamp: <07/03/08 21:41:21 ptr>
+# Time-stamp: <08/06/12 14:57:58 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2008
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
Modified: branches/complement-sockios/explore/Makefiles/gmake/lib/CC.mak
===================================================================
--- branches/complement-sockios/explore/Makefiles/gmake/lib/CC.mak 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/Makefiles/gmake/lib/CC.mak 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,6 +1,6 @@
-# -*- makefile -*- Time-stamp: <07/03/08 21:39:22 ptr>
+# -*- makefile -*- Time-stamp: <08/06/12 14:58:49 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2008
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -11,12 +11,9 @@
OPT += -xcode=pic32
-dbg-shared: LDFLAGS += -G -Qoption ld -z,initfirst -h$(SO_NAME_DBGxx) ${LDSEARCH} ${NOSTDLIB}
-stldbg-shared: LDFLAGS += -G -Qoption ld -z,initfirst -h$(SO_NAME_STLDBGxx) ${LDSEARCH} ${NOSTDLIB}
-release-shared: LDFLAGS += -G -Qoption ld -z,initfirst -h$(SO_NAMExx) ${LDSEARCH} ${NOSTDLIB}
-dbg-static: LDFLAGS += ${LDSEARCH}
-stldbg-static: LDFLAGS += ${LDSEARCH}
-release-static: LDFLAGS += ${LDSEARCH}
+dbg-shared: LDFLAGS += -G -Qoption ld -z,initfirst -h$(SO_NAME_DBGxx) ${NOSTDLIB}
+stldbg-shared: LDFLAGS += -G -Qoption ld -z,initfirst -h$(SO_NAME_STLDBGxx) ${NOSTDLIB}
+release-shared: LDFLAGS += -G -Qoption ld -z,initfirst -h$(SO_NAMExx) ${NOSTDLIB}
DEPENDS_COLLECTION_SUNPRO := $(DEPENDS_COLLECTION).sunpro
Modified: branches/complement-sockios/explore/Makefiles/gmake/lib/aCC.mak
===================================================================
--- branches/complement-sockios/explore/Makefiles/gmake/lib/aCC.mak 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/Makefiles/gmake/lib/aCC.mak 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,6 +1,6 @@
-# -*- makefile -*- Time-stamp: <07/05/31 00:50:40 ptr>
+# -*- makefile -*- Time-stamp: <08/06/12 14:59:23 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2008
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -9,6 +9,6 @@
# Licensed under the Academic Free License version 3.0
#
-dbg-shared: LDFLAGS += -b +nostl -Wl,+h$(SO_NAME_DBGxx) ${LDSEARCH}
-stldbg-shared: LDFLAGS += -b +nostl -Wl,+h$(SO_NAME_STLDBGxx) ${LDSEARCH}
-release-shared: LDFLAGS += -b +nostl -Wl,+h$(SO_NAMExx) ${LDSEARCH}
+dbg-shared: LDFLAGS += -b +nostl -Wl,+h$(SO_NAME_DBGxx)
+stldbg-shared: LDFLAGS += -b +nostl -Wl,+h$(SO_NAME_STLDBGxx)
+release-shared: LDFLAGS += -b +nostl -Wl,+h$(SO_NAMExx)
Modified: branches/complement-sockios/explore/Makefiles/gmake/lib/gcc.mak
===================================================================
--- branches/complement-sockios/explore/Makefiles/gmake/lib/gcc.mak 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/Makefiles/gmake/lib/gcc.mak 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,6 +1,6 @@
-# -*- makefile -*- Time-stamp: <07/05/31 00:55:13 ptr>
+# -*- makefile -*- Time-stamp: <08/06/12 14:08:48 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2008
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -71,11 +71,16 @@
endif
ifndef WITHOUT_STLPORT
-LDSEARCH += -L${STLPORT_LIB_DIR}
+ifeq (${STLPORT_LIB_DIR},)
release-shared: STLPORT_LIB = -lstlport
dbg-shared: STLPORT_LIB = -lstlportg
stldbg-shared: STLPORT_LIB = -lstlportstlg
+else
+release-shared: STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlport
+dbg-shared: STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlportg
+stldbg-shared: STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlportstlg
+endif
ifeq ($(OSNAME),windows)
LIB_VERSION = ${LIBMAJOR}.${LIBMINOR}
@@ -196,64 +201,52 @@
endif
ifeq ($(OSNAME),hp-ux)
-dbg-shared: LDFLAGS += -shared -Wl,-dynamic -Wl,+h$(SO_NAME_DBGxx) ${LDSEARCH}
-stldbg-shared: LDFLAGS += -shared -Wl,-dynamic -Wl,+h$(SO_NAME_STLDBGxx) ${LDSEARCH}
-release-shared: LDFLAGS += -shared -Wl,-dynamic -Wl,+h$(SO_NAMExx) ${LDSEARCH}
+dbg-shared: LDFLAGS += -shared -Wl,-dynamic -Wl,+h$(SO_NAME_DBGxx)
+stldbg-shared: LDFLAGS += -shared -Wl,-dynamic -Wl,+h$(SO_NAME_STLDBGxx)
+release-shared: LDFLAGS += -shared -Wl,-dynamic -Wl,+h$(SO_NAMExx)
endif
ifeq ($(OSNAME),sunos)
-dbg-shared: LDFLAGS += -shared -Wl,-h$(SO_NAME_DBGxx) ${NOSTDLIB} ${LDSEARCH}
-stldbg-shared: LDFLAGS += -shared -Wl,-h$(SO_NAME_STLDBGxx) ${NOSTDLIB} ${LDSEARCH}
-release-shared: LDFLAGS += -shared -Wl,-h$(SO_NAMExx) ${NOSTDLIB} ${LDSEARCH}
-dbg-static: LDFLAGS += ${LDSEARCH}
-stldbg-static: LDFLAGS += ${LDSEARCH}
-release-static: LDFLAGS += ${LDSEARCH}
+dbg-shared: LDFLAGS += -shared -Wl,-h$(SO_NAME_DBGxx) ${NOSTDLIB}
+stldbg-shared: LDFLAGS += -shared -Wl,-h$(SO_NAME_STLDBGxx) ${NOSTDLIB}
+release-shared: LDFLAGS += -shared -Wl,-h$(SO_NAMExx) ${NOSTDLIB}
endif
ifeq ($(OSNAME),linux)
-dbg-shared: LDFLAGS += -shared -Wl,-h$(SO_NAME_DBGxx) ${NOSTDLIB} ${LDSEARCH}
-stldbg-shared: LDFLAGS += -shared -Wl,-h$(SO_NAME_STLDBGxx) ${NOSTDLIB} ${LDSEARCH}
-release-shared: LDFLAGS += -shared -Wl,-h$(SO_NAMExx) ${NOSTDLIB} ${LDSEARCH}
-dbg-static: LDFLAGS += ${LDSEARCH}
-stldbg-static: LDFLAGS += ${LDSEARCH}
-release-static: LDFLAGS += ${LDSEARCH}
+dbg-shared: LDFLAGS += -shared -Wl,-h$(SO_NAME_DBGxx) ${NOSTDLIB}
+stldbg-shared: LDFLAGS += -shared -Wl,-h$(SO_NAME_STLDBGxx) ${NOSTDLIB}
+release-shared: LDFLAGS += -shared -Wl,-h$(SO_NAMExx) ${NOSTDLIB}
endif
ifeq ($(OSNAME),windows)
dbg-shared: LDFLAGS += -shared -Wl,--out-implib=${LIB_NAME_OUT_DBG},--enable-auto-image-base
stldbg-shared: LDFLAGS += -shared -Wl,--out-implib=${LIB_NAME_OUT_STLDBG},--enable-auto-image-base
release-shared: LDFLAGS += -shared -Wl,--out-implib=${LIB_NAME_OUT},--enable-auto-image-base
-dbg-static: LDFLAGS += -static ${LDSEARCH}
-stldbg-static: LDFLAGS += -static ${LDSEARCH}
-release-static: LDFLAGS += -static ${LDSEARCH}
+dbg-static: LDFLAGS += -static
+stldbg-static: LDFLAGS += -static
+release-static: LDFLAGS += -static
endif
ifeq ($(OSNAME),freebsd)
-dbg-shared: LDFLAGS += -shared -Wl,-h$(SO_NAME_DBGxx) ${NOSTDLIB} ${LDSEARCH}
-stldbg-shared: LDFLAGS += -shared -Wl,-h$(SO_NAME_STLDBGxx) ${NOSTDLIB} ${LDSEARCH}
-release-shared: LDFLAGS += -shared -Wl,-h$(SO_NAMExx) ${NOSTDLIB} ${LDSEARCH}
-dbg-static: LDFLAGS += ${LDSEARCH}
-stldbg-static: LDFLAGS += ${LDSEARCH}
-release-static: LDFLAGS += ${LDSEARCH}
+dbg-shared: LDFLAGS += -shared -Wl,-h$(SO_NAME_DBGxx) ${NOSTDLIB}
+stldbg-shared: LDFLAGS += -shared -Wl,-h$(SO_NAME_STLDBGxx) ${NOSTDLIB}
+release-shared: LDFLAGS += -shared -Wl,-h$(SO_NAMExx) ${NOSTDLIB}
endif
ifeq ($(OSNAME),darwin)
CURRENT_VERSION := ${MAJOR}.${MINOR}.${PATCH}
COMPATIBILITY_VERSION := $(CURRENT_VERSION)
-dbg-shared: LDFLAGS += -dynamic -dynamiclib -compatibility_version $(COMPATIBILITY_VERSION) -current_version $(CURRENT_VERSION) -install_name $(SO_NAME_DBGxx) ${LDSEARCH} ${NOSTDLIB}
-stldbg-shared: LDFLAGS += -dynamic -dynamiclib -compatibility_version $(COMPATIBILITY_VERSION) -current_version $(CURRENT_VERSION) -install_name $(SO_NAME_STLDBGxx) ${LDSEARCH} ${NOSTDLIB}
-release-shared: LDFLAGS += -dynamic -dynamiclib -compatibility_version $(COMPATIBILITY_VERSION) -current_version $(CURRENT_VERSION) -install_name $(SO_NAMExx) ${LDSEARCH} ${NOSTDLIB}
-dbg-static: LDFLAGS += -staticlib ${LDSEARCH}
-stldbg-static: LDFLAGS += -staticlib ${LDSEARCH}
-release-static: LDFLAGS += -staticlib ${LDSEARCH}
+dbg-shared: LDFLAGS += -dynamic -dynamiclib -compatibility_version $(COMPATIBILITY_VERSION) -current_version $(CURRENT_VERSION) -install_name $(SO_NAME_DBGxx) ${NOSTDLIB}
+stldbg-shared: LDFLAGS += -dynamic -dynamiclib -compatibility_version $(COMPATIBILITY_VERSION) -current_version $(CURRENT_VERSION) -install_name $(SO_NAME_STLDBGxx) ${NOSTDLIB}
+release-shared: LDFLAGS += -dynamic -dynamiclib -compatibility_version $(COMPATIBILITY_VERSION) -current_version $(CURRENT_VERSION) -install_name $(SO_NAMExx) ${NOSTDLIB}
+dbg-static: LDFLAGS += -staticlib
+stldbg-static: LDFLAGS += -staticlib
+release-static: LDFLAGS += -staticlib
endif
ifeq ($(OSNAME),openbsd)
-dbg-shared: LDFLAGS += -shared -Wl,-soname -Wl,$(SO_NAME_DBGxx) ${NOSTDLIB} ${LDSEARCH}
-stldbg-shared: LDFLAGS += -shared -Wl,-soname -Wl,$(SO_NAME_STLDBGxx) ${NOSTDLIB} ${LDSEARCH}
-release-shared: LDFLAGS += -shared -Wl,-soname -Wl,$(SO_NAMExx) ${NOSTDLIB} ${LDSEARCH}
-dbg-static: LDFLAGS += ${LDSEARCH}
-stldbg-static: LDFLAGS += ${LDSEARCH}
-release-static: LDFLAGS += ${LDSEARCH}
+dbg-shared: LDFLAGS += -shared -Wl,-soname -Wl,$(SO_NAME_DBGxx) ${NOSTDLIB}
+stldbg-shared: LDFLAGS += -shared -Wl,-soname -Wl,$(SO_NAME_STLDBGxx) ${NOSTDLIB}
+release-shared: LDFLAGS += -shared -Wl,-soname -Wl,$(SO_NAMExx) ${NOSTDLIB}
endif
Modified: branches/complement-sockios/explore/Makefiles/gmake/lib/icc.mak
===================================================================
--- branches/complement-sockios/explore/Makefiles/gmake/lib/icc.mak 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/Makefiles/gmake/lib/icc.mak 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,6 +1,6 @@
-# -*- makefile -*- Time-stamp: <07/03/08 21:37:08 ptr>
+# -*- makefile -*- Time-stamp: <08/06/12 15:00:07 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2008
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -9,19 +9,11 @@
# Licensed under the Academic Free License version 3.0
#
-# Oh, the commented below work for gmake 3.78.1 and above,
-# but phrase without tag not work for it. Since gmake 3.79
-# tag with assignment fail, but work assignment for all tags
-# (really that more correct).
-
OPT += -KPIC
ifeq ($(OSNAME),linux)
-dbg-shared: LDFLAGS += -shared -Wl,-h$(SO_NAME_DBGxx) ${LDSEARCH}
-stldbg-shared: LDFLAGS += -shared -Wl,-h$(SO_NAME_STLDBGxx) ${LDSEARCH}
-release-shared: LDFLAGS += -shared -Wl,-h$(SO_NAMExx) ${LDSEARCH}
-dbg-static: LDFLAGS += ${LDSEARCH}
-stldbg-static: LDFLAGS += ${LDSEARCH}
-release-static: LDFLAGS += ${LDSEARCH}
+dbg-shared: LDFLAGS += -shared -Wl,-h$(SO_NAME_DBGxx)
+stldbg-shared: LDFLAGS += -shared -Wl,-h$(SO_NAME_STLDBGxx)
+release-shared: LDFLAGS += -shared -Wl,-h$(SO_NAMExx)
endif
Modified: branches/complement-sockios/explore/Makefiles/gmake/lib/vc6.mak
===================================================================
--- branches/complement-sockios/explore/Makefiles/gmake/lib/vc6.mak 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/Makefiles/gmake/lib/vc6.mak 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,6 +1,6 @@
-# -*- makefile -*- Time-stamp: <07/03/08 21:35:57 ptr>
+# -*- makefile -*- Time-stamp: <08/06/12 15:03:15 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2008
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -9,13 +9,7 @@
# Licensed under the Academic Free License version 3.0
#
-# Oh, the commented below work for gmake 3.78.1 and above,
-# but phrase without tag not work for it. Since gmake 3.79
-# tag with assignment fail, but work assignment for all tags
-# (really that more correct).
-
LDLIBS ?=
-LDSEARCH += /LIBPATH:"$(MSVC_LIB_DIR)"
dbg-shared: OPT += /MDd
stldbg-shared: OPT += /MDd
@@ -30,11 +24,8 @@
stldbg-static: DEFS += /D_LIB
-dbg-shared: LDFLAGS += /DLL ${LDSEARCH}
-stldbg-shared: LDFLAGS += /DLL ${LDSEARCH}
-release-shared: LDFLAGS += /DLL ${LDSEARCH}
-dbg-static: LDFLAGS += ${LDSEARCH}
-stldbg-static: LDFLAGS += ${LDSEARCH}
-release-static: LDFLAGS += ${LDSEARCH}
+dbg-shared: LDFLAGS += /DLL
+stldbg-shared: LDFLAGS += /DLL
+release-shared: LDFLAGS += /DLL
-LDFLAGS += /VERSION:$(MAJOR).$(MINOR)
+LDFLAGS += /LIBPATH:"$(MSVC_LIB_DIR)" /VERSION:$(MAJOR).$(MINOR)
Modified: branches/complement-sockios/explore/configure
===================================================================
--- branches/complement-sockios/explore/configure 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/configure 2008-06-26 05:42:44 UTC (rev 1906)
@@ -40,6 +40,7 @@
--help print this help message and exit
--with-stlport=<dir> use STLport in catalog <dir>
+ --with-stlport-headers=<dir> use STLport headers in catalog <dir>
--without-stlport compile without STLport (default)
--with-boost=<dir> use boost headers in catalog <dir>
--with-system-boost use boost installed on this system
@@ -82,6 +83,7 @@
}
default_settings () {
+ :
# if [ "$boost_set" = "" ]; then
# write_option "${PWD}/external/boost" BOOST_DIR
# fi
@@ -140,6 +142,10 @@
write_option "$option" STLPORT_DIR
stlport_set=y
;;
+ --with-stlport-headers=*)
+ write_option "$option" STLPORT_INCLUDE_DIR
+ stlport_set=y
+ ;;
--without-stlport)
write_option "1" WITHOUT_STLPORT
stlport_set=y
Modified: branches/complement-sockios/explore/lib/DB/PgSQL/Makefile
===================================================================
--- branches/complement-sockios/explore/lib/DB/PgSQL/Makefile 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/lib/DB/PgSQL/Makefile 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,14 +1,21 @@
-# -*- Makefile -*- Time-stamp: <03/09/25 12:02:31 ptr>
+# -*- Makefile -*- Time-stamp: <08/06/12 15:09:05 ptr>
SRCROOT := ../../..
-PG_INCLUDE := /opt/pgsql/include
-PG_LIB := /opt/pgsql/lib
+# PG_INCLUDE := /opt/pgsql/include
+# PG_LIB_DIR := /opt/pgsql/lib
include Makefile.inc
include ${SRCROOT}/Makefiles/gmake/top.mak
-INCLUDES += -I$(SRCROOT)/include -I${PG_INCLUDE}
+INCLUDES += -I$(SRCROOT)/include
-LDSEARCH += -L${PG_LIB}
+ifneq (${PG_INCLUDE},)
+INCLUDES += -I${PG_INCLUDE}
+endif
+
+ifneq (${PG_LIB_DIR},)
+LDFLAGS += -L${PG_LIB_DIR}
+endif
+
LDLIBS = -lpq
Modified: branches/complement-sockios/explore/lib/exam/ut/Makefile
===================================================================
--- branches/complement-sockios/explore/lib/exam/ut/Makefile 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/lib/exam/ut/Makefile 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,4 +1,4 @@
-# -*- Makefile -*- Time-stamp: <07/09/03 22:27:45 ptr>
+# -*- Makefile -*- Time-stamp: <08/06/12 14:00:05 ptr>
SRCROOT := ../../..
@@ -15,12 +15,12 @@
ifeq ($(OSNAME),linux)
-release-shared: LDSEARCH += -L${LIBEXAM_DIR}/${OUTPUT_DIR} -L$(LIBXMT_DIR)/${OUTPUT_DIR} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR}:$(LIBXMT_DIR)/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
+release-shared: LDFLAGS += -L${LIBEXAM_DIR}/${OUTPUT_DIR} -L$(LIBXMT_DIR)/${OUTPUT_DIR} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR}:$(LIBXMT_DIR)/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
-dbg-shared: LDSEARCH += -L${LIBEXAM_DIR}/${OUTPUT_DIR_DBG} -L$(LIBXMT_DIR)/${OUTPUT_DIR_DBG} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR_DBG}:$(LIBXMT_DIR)/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
+dbg-shared: LDFLAGS += -L${LIBEXAM_DIR}/${OUTPUT_DIR_DBG} -L$(LIBXMT_DIR)/${OUTPUT_DIR_DBG} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR_DBG}:$(LIBXMT_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} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG}:$(LIBXMT_DIR)/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
+stldbg-shared: LDFLAGS += -L${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG} -L$(LIBXMT_DIR)/${OUTPUT_DIR_STLDBG} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG}:$(LIBXMT_DIR)/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
endif
endif
Modified: branches/complement-sockios/explore/lib/janus/Makefile
===================================================================
--- branches/complement-sockios/explore/lib/janus/Makefile 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/lib/janus/Makefile 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,4 +1,4 @@
-# -*- Makefile -*- Time-stamp: <07/02/07 12:28:46 ptr>
+# -*- Makefile -*- Time-stamp: <08/06/12 15:26:16 ptr>
SRCROOT := ../..
COMPILER_NAME := gcc
@@ -12,7 +12,7 @@
LIBSOCK_DIR = ${CoMT_DIR}/lib/sockios
LIBSTEM_DIR = ${CoMT_DIR}/lib/stem
-LDSEARCH += -L${CoMT_LIB_DIR} -Wl,--rpath=${CoMT_LIB_DIR}
+LDFLAGS += -L${CoMT_LIB_DIR} -Wl,--rpath=${CoMT_LIB_DIR}
release-shared : LDLIBS = -lxmt -lsockios -lstem
ifndef WITHOUT_STLPORT
Modified: branches/complement-sockios/explore/lib/janus/ut/Makefile
===================================================================
--- branches/complement-sockios/explore/lib/janus/ut/Makefile 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/lib/janus/ut/Makefile 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,4 +1,4 @@
-# -*- Makefile -*- Time-stamp: <07/08/08 22:18:48 ptr>
+# -*- Makefile -*- Time-stamp: <08/06/12 15:26:38 ptr>
SRCROOT := ../../..
COMPILER_NAME := gcc
@@ -20,12 +20,12 @@
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} -L$(LIBJANUS_DIR)/${OUTPUT_DIR} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR}:$(LIBXMT_DIR)/${OUTPUT_DIR}:${LIBSOCKIOS_DIR}/${OUTPUT_DIR}:${LIBSTEM_DIR}/${OUTPUT_DIR}:${LIBJANUS_DIR}${OUTPUT_DIR}:${STLPORT_LIB_DIR}
+release-shared: LDFLAGS += -L${LIBEXAM_DIR}/${OUTPUT_DIR} -L$(LIBXMT_DIR)/${OUTPUT_DIR} -L$(LIBSOCKIOS_DIR)/${OUTPUT_DIR} -L$(LIBSTEM_DIR)/${OUTPUT_DIR} -L$(LIBJANUS_DIR)/${OUTPUT_DIR} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR}:$(LIBXMT_DIR)/${OUTPUT_DIR}:${LIBSOCKIOS_DIR}/${OUTPUT_DIR}:${LIBSTEM_DIR}/${OUTPUT_DIR}:${LIBJANUS_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} -L$(LIBJANUS_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}:${LIBJANUS_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
+dbg-shared: LDFLAGS += -L${LIBEXAM_DIR}/${OUTPUT_DIR_DBG} -L$(LIBXMT_DIR)/${OUTPUT_DIR_DBG} -L$(LIBSOCKIOS_DIR)/${OUTPUT_DIR_DBG} -L$(LIBSTEM_DIR)/${OUTPUT_DIR_DBG} -L$(LIBJANUS_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}:${LIBJANUS_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} -L$(LIBJANUS_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}:${LIBJANUS_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
+stldbg-shared: LDFLAGS += -L${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG} -L$(LIBXMT_DIR)/${OUTPUT_DIR_STLDBG} -L$(LIBSOCKIOS_DIR)/${OUTPUT_DIR_STLDBG} -L$(LIBSTEM_DIR)/${OUTPUT_DIR_STLDBG} -L$(LIBJANUS_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}:${LIBJANUS_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
endif
endif
Modified: branches/complement-sockios/explore/lib/misc/ut/Makefile
===================================================================
--- branches/complement-sockios/explore/lib/misc/ut/Makefile 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/lib/misc/ut/Makefile 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,4 +1,4 @@
-# -*- Makefile -*- Time-stamp: <07/11/23 23:30:57 ptr>
+# -*- Makefile -*- Time-stamp: <08/06/12 15:20:10 ptr>
SRCROOT := ../../..
@@ -14,24 +14,22 @@
ifeq ($(OSNAME),linux)
-release-shared: LDSEARCH += -L${LIBEXAM_DIR}/${OUTPUT_DIR} -L${LIBXMT_DIR}/${OUTPUT_DIR} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR}:${LIBXMT_DIR}/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
+release-shared: LDFLAGS += -L${LIBEXAM_DIR}/${OUTPUT_DIR} -L${LIBXMT_DIR}/${OUTPUT_DIR} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR}:${LIBXMT_DIR}/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
-dbg-shared: LDSEARCH += -L${LIBEXAM_DIR}/${OUTPUT_DIR_DBG} -L${LIBXMT_DIR}/${OUTPUT_DIR_DBG} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR_DBG}:${LIBXMT_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
+dbg-shared: LDFLAGS += -L${LIBEXAM_DIR}/${OUTPUT_DIR_DBG} -L${LIBXMT_DIR}/${OUTPUT_DIR_DBG} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR_DBG}:${LIBXMT_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} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG}:${LIBXMT_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
+stldbg-shared: LDFLAGS += -L${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBXMT_DIR}/${OUTPUT_DIR_STLDBG} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG}:${LIBXMT_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
endif
endif
ifeq ($(OSNAME),openbsd)
-release-shared: LDSEARCH += -Wl,-R:${STLPORT_LIB_DIR}
-
-dbg-shared: LDSEARCH += -Wl,-R:${STLPORT_LIB_DIR}
-
ifndef WITHOUT_STLPORT
-stldbg-shared: LDSEARCH += -Wl,-R:${STLPORT_LIB_DIR}
+release-shared: LDFLAGS += -Wl,-R:${STLPORT_LIB_DIR}
+dbg-shared: LDFLAGS += -Wl,-R:${STLPORT_LIB_DIR}
+stldbg-shared: LDFLAGS += -Wl,-R:${STLPORT_LIB_DIR}
endif
endif
Deleted: branches/complement-sockios/explore/lib/mt/Makefile.mwccnlm
===================================================================
--- branches/complement-sockios/explore/lib/mt/Makefile.mwccnlm 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/lib/mt/Makefile.mwccnlm 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,32 +0,0 @@
-# -*- Makefile -*- Time-stamp: <03/06/13 16:51:25 ptr>
-# $Id$
-
-BASEDIR := $(shell xtmp=`pwd`; xtmp=`dirname $$xtmp`; dirname $$xtmp)
-LIBDIR := $(shell xtmp=`pwd`; dirname $$xtmp)
-
-COMPILER_NAME = mwccnlm
-include $(BASEDIR)/lib/mt/Makefile.inc
-
-all: all-release all-debug
-
-install: install-dbg-shared install-stldbg-shared install-release-shared
-
-all-shared: release-shared dbg-shared stldbg-shared
-
-all-debug: dbg-shared stldbg-shared
-
-all-release: release-shared
-
-include ${BASEDIR}/Makefiles/lib/Makefile.inc
-
-INCLUDES += -I$(STLPORT_INCLUDE_DIR) -I../../include
-
-release-shared: LDSEARCH = -L${STLPORT_LIB_DIR}
-stldbg-shared: LDSEARCH = -L${STLPORT_LIB_DIR}
-dbg-shared: LDSEARCH = -L${STLPORT_LIB_DIR}
-
-release-shared : LDLIBS = -lstlport_gcc
-stldbg-shared : LDLIBS = -lstlport_gcc_stldebug
-dbg-shared : LDLIBS = -lstlport_gcc
-
-
Deleted: branches/complement-sockios/explore/lib/mt/gcc-libstd.mak
===================================================================
--- branches/complement-sockios/explore/lib/mt/gcc-libstd.mak 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/lib/mt/gcc-libstd.mak 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,13 +0,0 @@
-# -*- Makefile -*- Time-stamp: <03/09/25 12:02:31 ptr>
-# $Id$
-
-SRCROOT := ../..
-COMPILER_NAME := gcc
-
-ALL_TAGS = release-shared dbg-shared
-
-include Makefile.inc
-include ${SRCROOT}/Makefiles/top.mak
-
-INCLUDES += -I$(SRCROOT)/include
-
Deleted: branches/complement-sockios/explore/lib/mt/mwccnlm.mak
===================================================================
--- branches/complement-sockios/explore/lib/mt/mwccnlm.mak 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/lib/mt/mwccnlm.mak 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,11 +0,0 @@
-# -*- Makefile -*- Time-stamp: <05/06/03 21:45:55 ptr>
-# $Id$
-
-SRCROOT := ../..
-COMPILER_NAME := mwccnlm
-
-STLPORT_DIR := ../../../Novell-STLP/STLport
-include Makefile.inc
-include ${SRCROOT}/Makefiles/top.mak
-
-INCLUDES += -I$(SRCROOT)/include -I$(STLPORT_INCLUDE_DIR)
Modified: branches/complement-sockios/explore/lib/mt/ut/Makefile
===================================================================
--- branches/complement-sockios/explore/lib/mt/ut/Makefile 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/lib/mt/ut/Makefile 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,4 +1,4 @@
-# -*- Makefile -*- Time-stamp: <07/08/03 22:38:12 ptr>
+# -*- Makefile -*- Time-stamp: <08/06/12 15:11:40 ptr>
SRCROOT := ../../..
@@ -27,24 +27,24 @@
ifeq ($(OSNAME),linux)
-release-shared: LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR} -L${LIBEXAM_DIR}/${OUTPUT_DIR} -L${LIBFS_DIR}/${OUTPUT_DIR} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR}:${LIBEXAM_DIR}/${OUTPUT_DIR}:${LIBFS_DIR}/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
+release-shared: LDFLAGS += -L${LIBMT_DIR}/${OUTPUT_DIR} -L${LIBEXAM_DIR}/${OUTPUT_DIR} -L${LIBFS_DIR}/${OUTPUT_DIR} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR}:${LIBEXAM_DIR}/${OUTPUT_DIR}:${LIBFS_DIR}/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
-dbg-shared: LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR_DBG} -L${LIBEXAM_DIR}/${OUTPUT_DIR_DBG} -L${LIBFS_DIR}/${OUTPUT_DIR_DBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_DBG}:${LIBEXAM_DIR}/${OUTPUT_DIR_DBG}:${LIBFS_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
+dbg-shared: LDFLAGS += -L${LIBMT_DIR}/${OUTPUT_DIR_DBG} -L${LIBEXAM_DIR}/${OUTPUT_DIR_DBG} -L${LIBFS_DIR}/${OUTPUT_DIR_DBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_DBG}:${LIBEXAM_DIR}/${OUTPUT_DIR_DBG}:${LIBFS_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
ifndef WITHOUT_STLPORT
-stldbg-shared: LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBFS_DIR}/${OUTPUT_DIR_STLDBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_STLDBG}:${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG}:${LIBFS_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
+stldbg-shared: LDFLAGS += -L${LIBMT_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBFS_DIR}/${OUTPUT_DIR_STLDBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_STLDBG}:${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG}:${LIBFS_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
endif
endif
ifeq ($(OSNAME),openbsd)
-release-shared: LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR} -Wl,-R${LIBMT_DIR}/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
+release-shared: LDFLAGS += -L${LIBMT_DIR}/${OUTPUT_DIR} -Wl,-R${LIBMT_DIR}/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
-dbg-shared: LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR_DBG} -Wl,-R${LIBMT_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
+dbg-shared: LDFLAGS += -L${LIBMT_DIR}/${OUTPUT_DIR_DBG} -Wl,-R${LIBMT_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
ifndef WITHOUT_STLPORT
-stldbg-shared: LDSEARCH += -L${LIBMT_DIR}/${OUTPUT_DIR_STLDBG} -Wl,-R${LIBMT_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
+stldbg-shared: LDFLAGS += -L${LIBMT_DIR}/${OUTPUT_DIR_STLDBG} -Wl,-R${LIBMT_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
endif
endif
Deleted: branches/complement-sockios/explore/lib/mt/ut/gcc-libstd.mak
===================================================================
--- branches/complement-sockios/explore/lib/mt/ut/gcc-libstd.mak 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/lib/mt/ut/gcc-libstd.mak 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,48 +0,0 @@
-# -*- Makefile -*- Time-stamp: <03/11/21 08:02:55 ptr>
-# $Id$
-
-SRCROOT := ../../..
-COMPILER_NAME := gcc
-ALL_TAGS = release-shared dbg-shared
-
-include Makefile.inc
-include ${SRCROOT}/Makefiles/top.mak
-
-
-INCLUDES += -I$(SRCROOT)/include -I$(BOOST_INCLUDE_DIR)
-
-# temporary, before dums fix strings:
-# DEFS += -D_STLP_DONT_USE_TEMPLATE_EXPRESSION
-
-ifeq ($(OSNAME),linux)
-release-shared: LDSEARCH = -L${CoMT_LIB_DIR} -Wl,--rpath=${CoMT_LIB_DIR}
-stldbg-shared: LDSEARCH = -L${CoMT_LIB_DIR_STLDBG} -Wl,--rpath=${CoMT_LIB_DIR_STLDBG}
-dbg-shared: LDSEARCH = -L${CoMT_LIB_DIR_DBG} -Wl,--rpath=${CoMT_LIB_DIR_DBG}
-endif
-
-ifeq ($(OSNAME),openbsd)
-release-shared: LDSEARCH = -L${CoMT_LIB_DIR} -Wl,-R${CoMT_LIB_DIR}
-stldbg-shared: LDSEARCH = -L${CoMT_LIB_DIR_STLDBG} -Wl,-R${CoMT_LIB_DIR_STLDBG}
-dbg-shared: LDSEARCH = -L${CoMT_LIB_DIR_DBG} -Wl,-R${CoMT_LIB_DIR_DBG}
-endif
-
-release-shared : LDLIBS = -lxmt_gcc -lboost_test_utf_gcc
-stldbg-shared : LDLIBS = -lxmt_gcc_stl-g -lboost_test_utf_gcc_stl-g
-dbg-shared : LDLIBS = -lxmt_gcc-g -lboost_test_utf_gcc-g
-
-ifeq ($(OSNAME),freebsd)
-release-shared : LDLIBS += -lthr
-stldbg-shared : LDLIBS += -lthr
-dbg-shared : LDLIBS += -lthr
-endif
-
-ifeq ($(OSNAME),sunos)
-release-shared : LDLIBS += -lrt
-stldbg-shared : LDLIBS += -lrt
-dbg-shared : LDLIBS += -lrt
-endif
-
-ifeq ($(OSNAME),openbsd)
-release-shared: LDLIBS = -lxmt_gcc -lboost_test_utf_gcc
-endif
-
Modified: branches/complement-sockios/explore/lib/net/samples/httpclient/Makefile
===================================================================
--- branches/complement-sockios/explore/lib/net/samples/httpclient/Makefile 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/lib/net/samples/httpclient/Makefile 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,4 +1,4 @@
-# -*- Makefile -*- Time-stamp: <07/02/21 15:30:59 ptr>
+# -*- Makefile -*- Time-stamp: <08/06/12 15:27:19 ptr>
SRCROOT := ../../../..
# CoMT_DIR := ../../external/complement/explore
@@ -18,15 +18,15 @@
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} -L${LIBBOOSTFS_DIR}/${OUTPUT_DIR} -L${LIBBOOSTRE_DIR}/${OUTPUT_DIR} -L${LIBNET_DIR}/${OUTPUT_DIR} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR}:${LIBEXAM_DIR}/${OUTPUT_DIR}:${LIBSOCK_DIR}/${OUTPUT_DIR}:${LIBSTEM_DIR}/${OUTPUT_DIR}:${LIBBOOSTFS_DIR}/${OUTPUT_DIR}:${LIBBOOSTRE_DIR}/${OUTPUT_DIR}:${LIBNET_DIR}/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
+release-shared: LDFLAGS += -L${LIBMT_DIR}/${OUTPUT_DIR} -L${LIBEXAM_DIR}/${OUTPUT_DIR} -L${LIBSOCK_DIR}/${OUTPUT_DIR} -L${LIBSTEM_DIR}/${OUTPUT_DIR} -L${LIBBOOSTFS_DIR}/${OUTPUT_DIR} -L${LIBBOOSTRE_DIR}/${OUTPUT_DIR} -L${LIBNET_DIR}/${OUTPUT_DIR} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR}:${LIBEXAM_DIR}/${OUTPUT_DIR}:${LIBSOCK_DIR}/${OUTPUT_DIR}:${LIBSTEM_DIR}/${OUTPUT_DIR}:${LIBBOOSTFS_DIR}/${OUTPUT_DIR}:${LIBBOOSTRE_DIR}/${OUTPUT_DIR}:${LIBNET_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} -L${LIBBOOSTFS_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBBOOSTRE_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBNET_DIR}/${OUTPUT_DIR_STLDBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_STLDBG}:${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG}:${LIBSOCK_DIR}/${OUTPUT_DIR_STLDBG}:${LIBSTEM_DIR}/${OUTPUT_DIR_STLDBG}:${LIBBOOSTFS_DIR}/${OUTPUT_DIR_STLDBG}:${LIBBOOSTRE_DIR}/${OUTPUT_DIR_STLDBG}:${LIBNET_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
+stldbg-shared: LDFLAGS += -L${LIBMT_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBSOCK_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBSTEM_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBBOOSTFS_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBBOOSTRE_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBNET_DIR}/${OUTPUT_DIR_STLDBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_STLDBG}:${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG}:${LIBSOCK_DIR}/${OUTPUT_DIR_STLDBG}:${LIBSTEM_DIR}/${OUTPUT_DIR_STLDBG}:${LIBBOOSTFS_DIR}/${OUTPUT_DIR_STLDBG}:${LIBBOOSTRE_DIR}/${OUTPUT_DIR_STLDBG}:${LIBNET_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} -L${LIBBOOSTFS_DIR}/${OUTPUT_DIR_DBG} -L${LIBBOOSTRE_DIR}/${OUTPUT_DIR_DBG} -L${LIBNET_DIR}/${OUTPUT_DIR_DBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_DBG}:${LIBEXAM_DIR}/${OUTPUT_DIR_DBG}:${LIBSOCK_DIR}/${OUTPUT_DIR_DBG}:${LIBSTEM_DIR}/${OUTPUT_DIR_DBG}:${LIBBOOSTFS_DIR}/${OUTPUT_DIR_DBG}:${LIBBOOSTRE_DIR}/${OUTPUT_DIR_DBG}:${LIBNET_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
+dbg-shared: LDFLAGS += -L${LIBMT_DIR}/${OUTPUT_DIR_DBG} -L${LIBEXAM_DIR}/${OUTPUT_DIR_DBG} -L${LIBSOCK_DIR}/${OUTPUT_DIR_DBG} -L${LIBSTEM_DIR}/${OUTPUT_DIR_DBG} -L${LIBBOOSTFS_DIR}/${OUTPUT_DIR_DBG} -L${LIBBOOSTRE_DIR}/${OUTPUT_DIR_DBG} -L${LIBNET_DIR}/${OUTPUT_DIR_DBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_DBG}:${LIBEXAM_DIR}/${OUTPUT_DIR_DBG}:${LIBSOCK_DIR}/${OUTPUT_DIR_DBG}:${LIBSTEM_DIR}/${OUTPUT_DIR_DBG}:${LIBBOOSTFS_DIR}/${OUTPUT_DIR_DBG}:${LIBBOOSTRE_DIR}/${OUTPUT_DIR_DBG}:${LIBNET_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
endif
Modified: branches/complement-sockios/explore/lib/net/ut/Makefile
===================================================================
--- branches/complement-sockios/explore/lib/net/ut/Makefile 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/lib/net/ut/Makefile 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,4 +1,4 @@
-# -*- Makefile -*- Time-stamp: <07/02/21 15:30:59 ptr>
+# -*- Makefile -*- Time-stamp: <08/06/12 15:17:05 ptr>
SRCROOT := ../../..
# CoMT_DIR := ../../external/complement/explore
@@ -18,15 +18,15 @@
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} -L${LIBBOOSTFS_DIR}/${OUTPUT_DIR} -L${LIBBOOSTRE_DIR}/${OUTPUT_DIR} -L${LIBNET_DIR}/${OUTPUT_DIR} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR}:${LIBEXAM_DIR}/${OUTPUT_DIR}:${LIBSOCK_DIR}/${OUTPUT_DIR}:${LIBSTEM_DIR}/${OUTPUT_DIR}:${LIBBOOSTFS_DIR}/${OUTPUT_DIR}:${LIBBOOSTRE_DIR}/${OUTPUT_DIR}:${LIBNET_DIR}/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
+release-shared: LDFLAGS += -L${LIBMT_DIR}/${OUTPUT_DIR} -L${LIBEXAM_DIR}/${OUTPUT_DIR} -L${LIBSOCK_DIR}/${OUTPUT_DIR} -L${LIBSTEM_DIR}/${OUTPUT_DIR} -L${LIBBOOSTFS_DIR}/${OUTPUT_DIR} -L${LIBBOOSTRE_DIR}/${OUTPUT_DIR} -L${LIBNET_DIR}/${OUTPUT_DIR} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR}:${LIBEXAM_DIR}/${OUTPUT_DIR}:${LIBSOCK_DIR}/${OUTPUT_DIR}:${LIBSTEM_DIR}/${OUTPUT_DIR}:${LIBBOOSTFS_DIR}/${OUTPUT_DIR}:${LIBBOOSTRE_DIR}/${OUTPUT_DIR}:${LIBNET_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} -L${LIBBOOSTFS_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBBOOSTRE_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBNET_DIR}/${OUTPUT_DIR_STLDBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_STLDBG}:${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG}:${LIBSOCK_DIR}/${OUTPUT_DIR_STLDBG}:${LIBSTEM_DIR}/${OUTPUT_DIR_STLDBG}:${LIBBOOSTFS_DIR}/${OUTPUT_DIR_STLDBG}:${LIBBOOSTRE_DIR}/${OUTPUT_DIR_STLDBG}:${LIBNET_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
+stldbg-shared: LDFLAGS += -L${LIBMT_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBSOCK_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBSTEM_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBBOOSTFS_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBBOOSTRE_DIR}/${OUTPUT_DIR_STLDBG} -L${LIBNET_DIR}/${OUTPUT_DIR_STLDBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_STLDBG}:${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG}:${LIBSOCK_DIR}/${OUTPUT_DIR_STLDBG}:${LIBSTEM_DIR}/${OUTPUT_DIR_STLDBG}:${LIBBOOSTFS_DIR}/${OUTPUT_DIR_STLDBG}:${LIBBOOSTRE_DIR}/${OUTPUT_DIR_STLDBG}:${LIBNET_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} -L${LIBBOOSTFS_DIR}/${OUTPUT_DIR_DBG} -L${LIBBOOSTRE_DIR}/${OUTPUT_DIR_DBG} -L${LIBNET_DIR}/${OUTPUT_DIR_DBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_DBG}:${LIBEXAM_DIR}/${OUTPUT_DIR_DBG}:${LIBSOCK_DIR}/${OUTPUT_DIR_DBG}:${LIBSTEM_DIR}/${OUTPUT_DIR_DBG}:${LIBBOOSTFS_DIR}/${OUTPUT_DIR_DBG}:${LIBBOOSTRE_DIR}/${OUTPUT_DIR_DBG}:${LIBNET_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
+dbg-shared: LDFLAGS += -L${LIBMT_DIR}/${OUTPUT_DIR_DBG} -L${LIBEXAM_DIR}/${OUTPUT_DIR_DBG} -L${LIBSOCK_DIR}/${OUTPUT_DIR_DBG} -L${LIBSTEM_DIR}/${OUTPUT_DIR_DBG} -L${LIBBOOSTFS_DIR}/${OUTPUT_DIR_DBG} -L${LIBBOOSTRE_DIR}/${OUTPUT_DIR_DBG} -L${LIBNET_DIR}/${OUTPUT_DIR_DBG} -Wl,--rpath=${LIBMT_DIR}/${OUTPUT_DIR_DBG}:${LIBEXAM_DIR}/${OUTPUT_DIR_DBG}:${LIBSOCK_DIR}/${OUTPUT_DIR_DBG}:${LIBSTEM_DIR}/${OUTPUT_DIR_DBG}:${LIBBOOSTFS_DIR}/${OUTPUT_DIR_DBG}:${LIBBOOSTRE_DIR}/${OUTPUT_DIR_DBG}:${LIBNET_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
endif
Modified: branches/complement-sockios/explore/lib/sockios/perf/Makefile
===================================================================
--- branches/complement-sockios/explore/lib/sockios/perf/Makefile 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/lib/sockios/perf/Makefile 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,4 +1,4 @@
-# -*- Makefile -*- Time-stamp: <07/09/05 22:48:46 ptr>
+# -*- Makefile -*- Time-stamp: <08/06/12 15:23:48 ptr>
SRCROOT := ../../..
@@ -18,11 +18,11 @@
# LIBUTF_DIR = ${CoMT_DIR}/../extern/custom/boost/libs/test/unit_test_framework
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}
+release-shared: LDFLAGS += -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}
+stldbg-shared: LDFLAGS += -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}
+dbg-shared: LDFLAGS += -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
Modified: branches/complement-sockios/explore/lib/sockios/ut/Makefile
===================================================================
--- branches/complement-sockios/explore/lib/sockios/ut/Makefile 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/lib/sockios/ut/Makefile 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,4 +1,4 @@
-# -*- Makefile -*- Time-stamp: <07/08/03 23:06:43 ptr>
+# -*- Makefile -*- Time-stamp: <08/06/12 15:24:26 ptr>
SRCROOT := ../../..
@@ -18,11 +18,11 @@
# LIBUTF_DIR = ${CoMT_DIR}/../extern/custom/boost/libs/test/unit_test_framework
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}
+release-shared: LDFLAGS += -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}
+stldbg-shared: LDFLAGS += -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}
+dbg-shared: LDFLAGS += -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
Modified: branches/complement-sockios/explore/lib/stem/ut/Makefile
===================================================================
--- branches/complement-sockios/explore/lib/stem/ut/Makefile 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/lib/stem/ut/Makefile 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,4 +1,4 @@
-# -*- Makefile -*- Time-stamp: <07/08/03 23:55:05 ptr>
+# -*- Makefile -*- Time-stamp: <08/06/12 15:25:10 ptr>
SRCROOT := ../../..
@@ -19,15 +19,15 @@
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}
+release-shared: LDFLAGS += -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}
+stldbg-shared: LDFLAGS += -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}
+dbg-shared: LDFLAGS += -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
Modified: branches/complement-sockios/explore/lib/stem/ut/dl/Makefile
===================================================================
--- branches/complement-sockios/explore/lib/stem/ut/dl/Makefile 2008-06-26 05:41:25 UTC (rev 1905)
+++ branches/complement-sockios/explore/lib/stem/ut/dl/Makefile 2008-06-26 05:42:44 UTC (rev 1906)
@@ -1,4 +1,4 @@
-# -*- Makefile -*- Time-stamp: <07/08/03 23:59:51 ptr>
+# -*- Makefile -*- Time-stamp: <08/06/12 15:25:51 ptr>
SRCROOT := ../../../..
@@ -12,11 +12,11 @@
INCLUDES += -I$(SRCROOT)/include
-#LDSEARCH = -L${STLPORT_LIB_DIR} -L${CoMT_LIB_DIR}
-release-shared: LDSEARCH += -L${LIBSTEM_DIR}/${OUTPUT_DIR}
-dbg-shared: LDSEARCH += -L${LIBSTEM_DIR}/${OUTPUT_DIR_DBG}
+#LDFLAGS = -L${STLPORT_LIB_DIR} -L${CoMT_LIB_DIR}
+release-shared: LDFLAGS += -L${LIBSTEM_DIR}/${OUTPUT_DIR}
+dbg-shared: LDFLAGS += -L${LIBSTEM_DIR}/${OUTPUT_DIR_DBG}
ifndef WITHOUT_STLPORT
-stldbg-shared: LDSEARCH += -L${LIBSTEM_DIR}/${OUTPUT_DIR_STLDBG}
+stldbg-shared: LDFLAGS += -L${LIBSTEM_DIR}/${OUTPUT_DIR_STLDBG}
endif
#release-shared : LDLIBS = -lxmt -lsockios -lstem -lboost_test_utf
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
