[complement-svn] SF.net SVN: complement: [1294] trunk/explore/perf/STL/lib

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

Revision: 1294
          http://svn.sourceforge.net/complement/?rev=1294&view=rev
Author:   complement
Date:     2006-10-05 06:32:23 -0700 (Thu, 05 Oct 2006)

Log Message:
-----------
take path to STLport from config.mak

Modified Paths:
--------------
    trunk/explore/perf/STL/lib/Makefile
    trunk/explore/perf/STL/lib/default/Makefile
    trunk/explore/perf/STL/lib/forcestringterm/Makefile
    trunk/explore/perf/STL/lib/malloc/Makefile
    trunk/explore/perf/STL/lib/misc/default/Makefile
    trunk/explore/perf/STL/lib/misc/libstdc++/Makefile
    trunk/explore/perf/STL/lib/misc/malloc/Makefile
    trunk/explore/perf/STL/lib/misc/newalloc/Makefile
    trunk/explore/perf/STL/lib/newalloc/Makefile
    trunk/explore/perf/STL/lib/noshortstr/Makefile

Modified: trunk/explore/perf/STL/lib/Makefile
===================================================================
--- trunk/explore/perf/STL/lib/Makefile	2006-10-05 06:49:32 UTC (rev 1293)
+++ trunk/explore/perf/STL/lib/Makefile	2006-10-05 13:32:23 UTC (rev 1294)
@@ -2,7 +2,9 @@
 
 DIRS = default malloc newalloc misc noshortstr forcestringterm
 
-STLPORT_SRC_DIR = ${HOME}/STLport.lab/STLport
+# STLPORT_SRC_DIR = ${HOME}/STLport.lab/STLport
+# include file, generated by configure, if available
+-include ../../../Makefiles/config.mak
 
 all:	Makefile.inc
 	for d in $(DIRS); do \
@@ -25,5 +27,5 @@
 	done
 	rm -f Makefile.inc
 
-Makefile.inc:	${STLPORT_SRC_DIR}/build/lib/Makefile.inc
-	sed -e 's|\.\./\.\./src|\$${STLPORT_SRC_DIR}/src|g' ${STLPORT_SRC_DIR}/build/lib/Makefile.inc > Makefile.inc
+Makefile.inc:	${STLPORT_DIR}/build/lib/Makefile.inc
+	sed -e 's|\.\./\.\./src|\$${STLPORT_DIR}/src|g' ${STLPORT_DIR}/build/lib/Makefile.inc > Makefile.inc

Modified: trunk/explore/perf/STL/lib/default/Makefile
===================================================================
--- trunk/explore/perf/STL/lib/default/Makefile	2006-10-05 06:49:32 UTC (rev 1293)
+++ trunk/explore/perf/STL/lib/default/Makefile	2006-10-05 13:32:23 UTC (rev 1294)
@@ -1,7 +1,10 @@
 # -*- Makefile -*- Time-stamp: <05/12/27 00:04:36 ptr>
 
-STLPORT_SRC_DIR := /export/home/ptr/STLport.lab/STLport
-SRCROOT := ${STLPORT_SRC_DIR}/build
+# STLPORT_SRC_DIR := /export/home/ptr/STLport.lab/STLport
+# include file, generated by configure, if available
+-include ../../../../Makefiles/config.mak
+
+SRCROOT := ${STLPORT_DIR}/build
 INSTALL_LIB_DIR        := ../../build/lib
 INSTALL_LIB_DIR_DBG    := .
 INSTALL_LIB_DIR_STLDBG := .
@@ -12,7 +15,7 @@
 
 COMPILER_NAME := gcc
 
-STLPORT_INCLUDE_DIR = ${STLPORT_SRC_DIR}/stlport
+STLPORT_INCLUDE_DIR = ${STLPORT_DIR}/stlport
 include ../Makefile.inc
 include ${SRCROOT}/Makefiles/top.mak
 

Modified: trunk/explore/perf/STL/lib/forcestringterm/Makefile
===================================================================
--- trunk/explore/perf/STL/lib/forcestringterm/Makefile	2006-10-05 06:49:32 UTC (rev 1293)
+++ trunk/explore/perf/STL/lib/forcestringterm/Makefile	2006-10-05 13:32:23 UTC (rev 1294)
@@ -1,7 +1,10 @@
 # -*- Makefile -*- Time-stamp: <05/12/27 01:08:40 ptr>
 
-STLPORT_SRC_DIR := /export/home/ptr/STLport.lab/STLport
-SRCROOT := ${STLPORT_SRC_DIR}/build
+# STLPORT_SRC_DIR := /export/home/ptr/STLport.lab/STLport
+# include file, generated by configure, if available
+-include ../../../../Makefiles/config.mak
+
+SRCROOT := ${STLPORT_DIR}/build
 INSTALL_LIB_DIR        := ../../build/lib/forcestringterm
 INSTALL_LIB_DIR_DBG    := .
 INSTALL_LIB_DIR_STLDBG := .
@@ -12,7 +15,7 @@
 
 COMPILER_NAME := gcc
 
-STLPORT_INCLUDE_DIR = ${STLPORT_SRC_DIR}/stlport
+STLPORT_INCLUDE_DIR = ${STLPORT_DIR}/stlport
 include ../Makefile.inc
 include ${SRCROOT}/Makefiles/top.mak
 

Modified: trunk/explore/perf/STL/lib/malloc/Makefile
===================================================================
--- trunk/explore/perf/STL/lib/malloc/Makefile	2006-10-05 06:49:32 UTC (rev 1293)
+++ trunk/explore/perf/STL/lib/malloc/Makefile	2006-10-05 13:32:23 UTC (rev 1294)
@@ -1,7 +1,10 @@
 # -*- Makefile -*- Time-stamp: <05/12/27 00:05:05 ptr>
 
-STLPORT_SRC_DIR := /export/home/ptr/STLport.lab/STLport
-SRCROOT := ${STLPORT_SRC_DIR}/build
+# STLPORT_SRC_DIR := /export/home/ptr/STLport.lab/STLport
+# include file, generated by configure, if available
+-include ../../../../Makefiles/config.mak
+
+SRCROOT := ${STLPORT_DIR}/build
 INSTALL_LIB_DIR        := ../../build/lib/malloc
 INSTALL_LIB_DIR_DBG    := .
 INSTALL_LIB_DIR_STLDBG := .
@@ -12,7 +15,7 @@
 
 COMPILER_NAME := gcc
 
-STLPORT_INCLUDE_DIR = ${STLPORT_SRC_DIR}/stlport
+STLPORT_INCLUDE_DIR = ${STLPORT_DIR}/stlport
 include ../Makefile.inc
 include ${SRCROOT}/Makefiles/top.mak
 

Modified: trunk/explore/perf/STL/lib/misc/default/Makefile
===================================================================
--- trunk/explore/perf/STL/lib/misc/default/Makefile	2006-10-05 06:49:32 UTC (rev 1293)
+++ trunk/explore/perf/STL/lib/misc/default/Makefile	2006-10-05 13:32:23 UTC (rev 1294)
@@ -2,8 +2,6 @@
 
 SRCROOT := ../../../../..
 COMPILER_NAME := gcc
-STLPORT_SRC_DIR := /export/home/ptr/STLport.lab/STLport
-STLPORT_INCLUDE_DIR := $(STLPORT_SRC_DIR)/stlport
 INSTALL_LIB_DIR     := ../../../build/lib
 ALL_TAGS := install-release-shared
 

Modified: trunk/explore/perf/STL/lib/misc/libstdc++/Makefile
===================================================================
--- trunk/explore/perf/STL/lib/misc/libstdc++/Makefile	2006-10-05 06:49:32 UTC (rev 1293)
+++ trunk/explore/perf/STL/lib/misc/libstdc++/Makefile	2006-10-05 13:32:23 UTC (rev 1294)
@@ -2,8 +2,6 @@
 
 SRCROOT := ../../../../..
 COMPILER_NAME := gcc
-STLPORT_SRC_DIR := /export/home/ptr/STLport.lab/STLport
-STLPORT_INCLUDE_DIR := $(STLPORT_SRC_DIR)/stlport
 INSTALL_LIB_DIR     := ../../../build/lib/libstdc++
 ALL_TAGS := install-release-shared
 

Modified: trunk/explore/perf/STL/lib/misc/malloc/Makefile
===================================================================
--- trunk/explore/perf/STL/lib/misc/malloc/Makefile	2006-10-05 06:49:32 UTC (rev 1293)
+++ trunk/explore/perf/STL/lib/misc/malloc/Makefile	2006-10-05 13:32:23 UTC (rev 1294)
@@ -2,8 +2,6 @@
 
 SRCROOT := ../../../../..
 COMPILER_NAME := gcc
-STLPORT_SRC_DIR := /export/home/ptr/STLport.lab/STLport
-STLPORT_INCLUDE_DIR := $(STLPORT_SRC_DIR)/stlport
 INSTALL_LIB_DIR     := ../../../build/lib/malloc
 ALL_TAGS := install-release-shared
 

Modified: trunk/explore/perf/STL/lib/misc/newalloc/Makefile
===================================================================
--- trunk/explore/perf/STL/lib/misc/newalloc/Makefile	2006-10-05 06:49:32 UTC (rev 1293)
+++ trunk/explore/perf/STL/lib/misc/newalloc/Makefile	2006-10-05 13:32:23 UTC (rev 1294)
@@ -2,8 +2,6 @@
 
 SRCROOT := ../../../../..
 COMPILER_NAME := gcc
-STLPORT_SRC_DIR := /export/home/ptr/STLport.lab/STLport
-STLPORT_INCLUDE_DIR := $(STLPORT_SRC_DIR)/stlport
 INSTALL_LIB_DIR     := ../../../build/lib/newalloc
 ALL_TAGS := install-release-shared
 

Modified: trunk/explore/perf/STL/lib/newalloc/Makefile
===================================================================
--- trunk/explore/perf/STL/lib/newalloc/Makefile	2006-10-05 06:49:32 UTC (rev 1293)
+++ trunk/explore/perf/STL/lib/newalloc/Makefile	2006-10-05 13:32:23 UTC (rev 1294)
@@ -1,7 +1,10 @@
 # -*- Makefile -*- Time-stamp: <05/12/27 00:05:24 ptr>
 
-STLPORT_SRC_DIR := /export/home/ptr/STLport.lab/STLport
-SRCROOT := ${STLPORT_SRC_DIR}/build
+# STLPORT_SRC_DIR := /export/home/ptr/STLport.lab/STLport
+# include file, generated by configure, if available
+-include ../../../../Makefiles/config.mak
+
+SRCROOT := ${STLPORT_DIR}/build
 INSTALL_LIB_DIR        := ../../build/lib/newalloc
 INSTALL_LIB_DIR_DBG    := .
 INSTALL_LIB_DIR_STLDBG := .
@@ -12,7 +15,7 @@
 
 COMPILER_NAME := gcc
 
-STLPORT_INCLUDE_DIR = ${STLPORT_SRC_DIR}/stlport
+STLPORT_INCLUDE_DIR = ${STLPORT_DIR}/stlport
 include ../Makefile.inc
 include ${SRCROOT}/Makefiles/top.mak
 

Modified: trunk/explore/perf/STL/lib/noshortstr/Makefile
===================================================================
--- trunk/explore/perf/STL/lib/noshortstr/Makefile	2006-10-05 06:49:32 UTC (rev 1293)
+++ trunk/explore/perf/STL/lib/noshortstr/Makefile	2006-10-05 13:32:23 UTC (rev 1294)
@@ -1,7 +1,10 @@
 # -*- Makefile -*- Time-stamp: <05/12/27 01:08:40 ptr>
 
-STLPORT_SRC_DIR := /export/home/ptr/STLport.lab/STLport
-SRCROOT := ${STLPORT_SRC_DIR}/build
+# STLPORT_SRC_DIR := /export/home/ptr/STLport.lab/STLport
+# include file, generated by configure, if available
+-include ../../../../Makefiles/config.mak
+
+SRCROOT := ${STLPORT_DIR}/build
 INSTALL_LIB_DIR        := ../../build/lib/noshortstr
 INSTALL_LIB_DIR_DBG    := .
 INSTALL_LIB_DIR_STLDBG := .
@@ -12,7 +15,7 @@
 
 COMPILER_NAME := gcc
 
-STLPORT_INCLUDE_DIR = ${STLPORT_SRC_DIR}/stlport
+STLPORT_INCLUDE_DIR = ${STLPORT_DIR}/stlport
 include ../Makefile.inc
 include ${SRCROOT}/Makefiles/top.mak
 


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