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

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

Revision: 1373
          http://svn.sourceforge.net/complement/?rev=1373&view=rev
Author:   complement
Date:     2006-11-02 00:12:25 -0800 (Thu, 02 Nov 2006)

Log Message:
-----------
remove excessive build/install without STLport

Modified Paths:
--------------
    trunk/complement/explore/Makefiles/gmake/app/rules-install.mak
    trunk/complement/explore/Makefiles/gmake/app/rules.mak
    trunk/complement/explore/Makefiles/gmake/lib/rules-install-a.mak
    trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak
    trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak
    trunk/complement/explore/Makefiles/gmake/unix/lib.mak
    trunk/complement/explore/Makefiles/top.mak
    trunk/complement/explore/test/libmt/unit/Makefile

Modified: trunk/complement/explore/Makefiles/gmake/app/rules-install.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/rules-install.mak	2006-11-02 06:50:56 UTC (rev 1372)
+++ trunk/complement/explore/Makefiles/gmake/app/rules-install.mak	2006-11-02 08:12:25 UTC (rev 1373)
@@ -1,6 +1,19 @@
-# -*- makefile -*- Time-stamp: <06/01/18 14:55:29 ptr>
+# -*- makefile -*- Time-stamp: <06/11/02 10:45:53 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
 
+ifndef WITHOUT_STLPORT
 install:	install-release-shared install-dbg-shared install-stldbg-shared
+else
+install:	install-release-shared install-dbg-shared
+endif
 
 # The program name to be installed will be the same as compiled name,
 # but it will be a bit altered in case of installation debug and/or
@@ -14,11 +27,13 @@
 INSTALL_PRGNAME_DBG := ${INSTALL_PRGNAME}
 #endif
 
+ifndef WITHOUT_STLPORT
 #ifeq (${INSTALL_BIN_DIR},${INSTALL_BIN_DIR_STLDBG})
 #INSTALL_PRGNAME_STLDBG := ${PRGNAME}stlg${EXE}
 #else
 INSTALL_PRGNAME_STLDBG := ${INSTALL_PRGNAME}
 #endif
+endif
 
 #ifeq (${INSTALL_BIN_DIR_DBG},${INSTALL_BIN_DIR_STLDBG})
 #INSTALL_PRGNAME_DBG := ${PRGNAME}g${EXE}
@@ -31,5 +46,7 @@
 install-dbg-shared: dbg-shared $(INSTALL_BIN_DIR_DBG)
 	$(INSTALL_EXE) ${PRG_DBG} $(INSTALL_BIN_DIR_DBG)/${INSTALL_PRGNAME_DBG}
 
+ifndef WITHOUT_STLPORT
 install-stldbg-shared: stldbg-shared $(INSTALL_BIN_DIR_STLDBG)
 	$(INSTALL_EXE) ${PRG_STLDBG} $(INSTALL_BIN_DIR_STLDBG)/${INSTALL_PRGNAME_STLDBG}
+endif

Modified: trunk/complement/explore/Makefiles/gmake/app/rules.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/rules.mak	2006-11-02 06:50:56 UTC (rev 1372)
+++ trunk/complement/explore/Makefiles/gmake/app/rules.mak	2006-11-02 08:12:25 UTC (rev 1373)
@@ -1,12 +1,22 @@
-# -*- makefile -*- Time-stamp: <05/05/04 22:58:09 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <06/11/02 10:47:37 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
 
 dbg-shared:	$(EXTRA_PRE_DBG) $(OUTPUT_DIR_DBG) ${PRG_DBG} $(EXTRA_POST_DBG)
 
+release-shared:	$(EXTRA_PRE) $(OUTPUT_DIR) ${PRG} $(EXTRA_POST)
+
+ifndef WITHOUT_STLPORT
 stldbg-shared:	$(EXTRA_PRE_STLDBG) $(OUTPUT_DIR_STLDBG) ${PRG_STLDBG} $(EXTRA_POST_STLDBG)
+endif
 
-release-shared:	$(EXTRA_PRE) $(OUTPUT_DIR) ${PRG} $(EXTRA_POST)
-
 ifeq ("${_C_SOURCES_ONLY}","")
 
 ${PRG}:	$(OBJ) $(LIBSDEP)
@@ -15,8 +25,10 @@
 ${PRG_DBG}:	$(OBJ_DBG) $(LIBSDEP)
 	$(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_DBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
 
+ifndef WITHOUT_STLPORT
 ${PRG_STLDBG}:	$(OBJ_STLDBG) $(LIBSDEP)
 	$(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_STLDBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
+endif
 
 else
 
@@ -26,7 +38,9 @@
 ${PRG_DBG}:	$(OBJ_DBG) $(LIBSDEP)
 	$(LINK.c) $(LINK_OUTPUT_OPTION) $(OBJ_DBG) $(LDLIBS)
 
+ifndef WITHOUT_STLPORT
 ${PRG_STLDBG}:	$(OBJ_STLDBG) $(LIBSDEP)
 	$(LINK.c) $(LINK_OUTPUT_OPTION) $(OBJ_STLDBG) $(LDLIBS)
+endif
 
 endif

Modified: trunk/complement/explore/Makefiles/gmake/lib/rules-install-a.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/rules-install-a.mak	2006-11-02 06:50:56 UTC (rev 1372)
+++ trunk/complement/explore/Makefiles/gmake/lib/rules-install-a.mak	2006-11-02 08:12:25 UTC (rev 1373)
@@ -1,5 +1,13 @@
-# -*- makefile -*- Time-stamp: <04/03/16 17:23:52 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <06/11/02 10:34:43 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
 
 PHONY += install-release-static install-dbg-static install-stldbg-static
 
@@ -15,8 +23,12 @@
 	fi
 	$(INSTALL_A) ${A_NAME_OUT_DBG} $(INSTALL_LIB_DIR_DBG)
 
+ifndef WITHOUT_STLPORT
+
 install-stldbg-static:	stldbg-static
 	@if [ ! -d $(INSTALL_LIB_DIR_STLDBG) ] ; then \
 	  mkdir -p $(INSTALL_LIB_DIR_STLDBG) ; \
 	fi
 	$(INSTALL_A) ${A_NAME_OUT_STLDBG} $(INSTALL_LIB_DIR_STLDBG)
+
+endif

Modified: trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak	2006-11-02 06:50:56 UTC (rev 1372)
+++ trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak	2006-11-02 08:12:25 UTC (rev 1373)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/10/12 19:53:51 ptr>
+# -*- makefile -*- Time-stamp: <06/11/02 10:43:02 ptr>
 #
 # Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
 # Petr Ovtchenkov
@@ -9,7 +9,11 @@
 # Licensed under the Academic Free License version 3.0
 #
 
+ifndef WITHOUT_STLPORT
 INSTALL_TAGS ?= install-release-shared install-dbg-shared install-stldbg-shared
+else
+INSTALL_TAGS ?= install-release-shared install-dbg-shared
+endif
 
 PHONY += install $(INSTALL_TAGS)
 
@@ -76,6 +80,7 @@
 install-dbg-shared:	dbg-shared $(INSTALL_LIB_DIR_DBG) $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx}
 	${POST_INSTALL_DBG}
 
+ifndef WITHOUT_STLPORT
 $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx}:	${SO_NAME_OUT_STLDBGxxx}
 	$(INSTALL_SO) ${SO_NAME_OUT_STLDBGxxx} $(INSTALL_LIB_DIR_STLDBG)
 	@if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx} ] ; then \
@@ -106,3 +111,5 @@
 install-stldbg-shared:	stldbg-shared $(INSTALL_LIB_DIR_STLDBG) $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx}
 	${POST_INSTALL_STLDBG}
 
+# WITHOUT_STLPORT
+endif

Modified: trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak	2006-11-02 06:50:56 UTC (rev 1372)
+++ trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak	2006-11-02 08:12:25 UTC (rev 1373)
@@ -1,4 +1,13 @@
-# -*- makefile -*- Time-stamp: <06/10/09 17:36:05 ptr>
+# -*- makefile -*- Time-stamp: <06/11/02 10:40:52 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
 
 # Shared libraries tags
 
@@ -8,8 +17,12 @@
 
 dbg-shared:	$(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBGxxx}
 
+ifndef WITHOUT_STLPORT
+
 stldbg-shared:	$(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBGxxx}
 
+endif
+
 ifeq ("${_C_SOURCES_ONLY}","")
 
 ${SO_NAME_OUTxxx}:	$(OBJ) $(LIBSDEP)
@@ -66,6 +79,8 @@
 	  ln -s ${SO_NAME_DBGx} $(OUTPUT_DIR_DBG)/${SO_NAME_DBG}; \
 	fi
 
+ifndef WITHOUT_STLPORT
+
 ${SO_NAME_OUT_STLDBGxxx}:	$(OBJ_STLDBG) $(LIBSDEP)
 	$(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_STLDBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
 	@if [ -h $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGxx} ] ; then \
@@ -93,6 +108,10 @@
 	  ln -s ${SO_NAME_STLDBGx} $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG}; \
 	fi
 
+# WITHOUT_STLPORT
+endif
+
+# _C_SOURCES_ONLY
 else
 
 ${SO_NAME_OUTxxx}:	$(OBJ) $(LIBSDEP)
@@ -149,6 +168,8 @@
 	  ln -s ${SO_NAME_DBGx} $(OUTPUT_DIR_DBG)/${SO_NAME_DBG}; \
 	fi
 
+ifndef WITHOUT_STLPORT
+
 ${SO_NAME_OUT_STLDBGxxx}:	$(OBJ_STLDBG) $(LIBSDEP)
 	$(LINK.c) $(LINK_OUTPUT_OPTION) $(OBJ_STLDBG) $(LDLIBS)
 	@if [ -h $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGxx} ] ; then \
@@ -176,4 +197,8 @@
 	  ln -s ${SO_NAME_STLDBGx} $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG}; \
 	fi
 
+# WITHOUT_STLPORT
 endif
+
+# !_C_SOURCES_ONLY
+endif

Modified: trunk/complement/explore/Makefiles/gmake/unix/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/unix/lib.mak	2006-11-02 06:50:56 UTC (rev 1372)
+++ trunk/complement/explore/Makefiles/gmake/unix/lib.mak	2006-11-02 08:12:25 UTC (rev 1373)
@@ -1,5 +1,13 @@
-# -*- makefile -*- Time-stamp: <03/10/19 12:26:05 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <06/11/02 10:37:02 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
 
 DBG_SUFFIX := g
 STLDBG_SUFFIX := stl${DBG_SUFFIX}
@@ -40,6 +48,8 @@
 SO_NAME_OUT_DBGxx  := $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxx}
 SO_NAME_OUT_DBGxxx := $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxxx}
 
+ifndef WITHOUT_STLPORT
+
 ifeq ($(OSNAME),darwin)
 SO_NAME_STLDBG    := lib${LIBNAME}${STLDBG_SUFFIX}.$(SO)
 SO_NAME_STLDBGx   := lib${LIBNAME}${STLDBG_SUFFIX}.${MAJOR}.$(SO)
@@ -56,6 +66,8 @@
 SO_NAME_OUT_STLDBGx   := $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGx}
 SO_NAME_OUT_STLDBGxx  := $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGxx}
 SO_NAME_OUT_STLDBGxxx := $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGxxx}
+# WITHOUT_STLPORT
+endif
 
 # Static libraries:
 
@@ -65,5 +77,7 @@
 A_NAME_DBG := lib${LIBNAME}${DBG_SUFFIX}.$(ARCH)
 A_NAME_OUT_DBG := $(OUTPUT_DIR_A_DBG)/$(A_NAME_DBG)
 
+ifndef WITHOUT_STLPORT
 A_NAME_STLDBG := lib${LIBNAME}${STLDBG_SUFFIX}.$(ARCH)
 A_NAME_OUT_STLDBG := $(OUTPUT_DIR_A_STLDBG)/$(A_NAME_STLDBG)
+endif

Modified: trunk/complement/explore/Makefiles/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/top.mak	2006-11-02 06:50:56 UTC (rev 1372)
+++ trunk/complement/explore/Makefiles/top.mak	2006-11-02 08:12:25 UTC (rev 1373)
@@ -1,4 +1,13 @@
-# Time-stamp: <06/06/28 12:03:17 ptr>
+# Time-stamp: <06/11/02 10:32:17 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
 
 .SUFFIXES:
 .SCCS_GET:
@@ -8,12 +17,21 @@
 
 RULESBASE ?= $(SRCROOT)/Makefiles
 
+ifndef WITHOUT_STLPORT
 ALL_TAGS ?= release-shared	dbg-shared	stldbg-shared
+else
+ALL_TAGS ?= release-shared	dbg-shared
+endif
 
 all:	$(OUTPUT_DIRS) $(ALL_TAGS)
 
+ifndef WITHOUT_STLPORT
 all-static:	release-static	dbg-static	stldbg-static
 all-shared:	release-shared	dbg-shared	stldbg-shared
+else
+all-static:	release-static	dbg-static
+all-shared:	release-shared	dbg-shared
+endif
 
 # include file, generated by configure, if available
 -include ${RULESBASE}/config.mak

Modified: trunk/complement/explore/test/libmt/unit/Makefile
===================================================================
--- trunk/complement/explore/test/libmt/unit/Makefile	2006-11-02 06:50:56 UTC (rev 1372)
+++ trunk/complement/explore/test/libmt/unit/Makefile	2006-11-02 08:12:25 UTC (rev 1373)
@@ -1,7 +1,6 @@
 # -*- Makefile -*- Time-stamp: <06/08/04 10:54:19 ptr>
 
 SRCROOT := ../../..
-BOOST_DIR := ${HOME}/labs/boost
 COMPILER_NAME := gcc
 
 include Makefile.inc
@@ -13,6 +12,11 @@
 # temporary, before dums fix strings:
 # DEFS += -D_STLP_DONT_USE_TEMPLATE_EXPRESSION
 
+# RPATH := $(realpath ${CoMT_LIB_DIR})
+# ifndef WITHOUT_STLPORT
+# RPATH := ${RPATH}:$(realpath ${STLPORT_LIB_DIR}):$(realpath /usr/lib)
+# endif
+
 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}


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