Thread: [complement-svn] SF.net SVN: complement: [1539] trunk/complement/explore/Makefiles/gmake
Status: Pre-Alpha
Brought to you by:
complement
Menu
▾
▴
complement-svn
|
From: <com...@us...> - 2007-02-28 17:15:51
|
Revision: 1539
http://svn.sourceforge.net/complement/?rev=1539&view=rev
Author: complement
Date: 2007-02-28 09:15:33 -0800 (Wed, 28 Feb 2007)
Log Message:
-----------
group POSIX-like behaviour into 'unix'
Modified Paths:
--------------
trunk/complement/explore/Makefiles/gmake/darwin/lib.mak
trunk/complement/explore/Makefiles/gmake/lib/top.mak
trunk/complement/explore/Makefiles/gmake/unix/lib.mak
trunk/complement/explore/Makefiles/gmake/windows/lib.mak
trunk/complement/explore/Makefiles/gmake/windows/rules-install-so.mak
Added Paths:
-----------
trunk/complement/explore/Makefiles/gmake/unix/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/unix/rules-so.mak
Removed Paths:
-------------
trunk/complement/explore/Makefiles/gmake/cygming/lib.mak
trunk/complement/explore/Makefiles/gmake/cygming/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/darwin/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/darwin/rules-so.mak
trunk/complement/explore/Makefiles/gmake/freebsd/lib.mak
trunk/complement/explore/Makefiles/gmake/freebsd/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/freebsd/rules-so.mak
trunk/complement/explore/Makefiles/gmake/hp-ux/lib.mak
trunk/complement/explore/Makefiles/gmake/hp-ux/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/hp-ux/rules-so.mak
trunk/complement/explore/Makefiles/gmake/linux/lib.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/openbsd/lib.mak
trunk/complement/explore/Makefiles/gmake/openbsd/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/openbsd/rules-so.mak
trunk/complement/explore/Makefiles/gmake/sunos/lib.mak
trunk/complement/explore/Makefiles/gmake/sunos/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/sunos/rules-so.mak
trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak
Deleted: trunk/complement/explore/Makefiles/gmake/cygming/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/cygming/lib.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/cygming/lib.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,44 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/07/15 18:23:04 ptr>
-# $Id$
-
-RELEASE_SUFFIX := r
-DBG_SUFFIX := d
-STLDBG_SUFFIX := stl${DBG_SUFFIX}
-
-# Shared libraries:
-SO_NAME_BASE := ${LIBNAME}_${RELEASE_SUFFIX}${MAJOR}${MINOR}
-SO_NAME := ${SO_NAME_BASE}.$(SO)
-LIB_NAME := ${SO_NAME_BASE}.$(LIB)
-EXP_NAME := ${SO_NAME_BASE}.$(EXP)
-
-SO_NAME_OUT := $(OUTPUT_DIR)/${SO_NAME}
-LIB_NAME_OUT := $(OUTPUT_DIR)/${LIB_NAME}
-EXP_NAME_OUT := $(OUTPUT_DIR)/${EXP_NAME}
-
-SO_NAME_DBG_BASE := ${LIBNAME}_${DBG_SUFFIX}${MAJOR}${MINOR}
-SO_NAME_DBG := ${SO_NAME_DBG_BASE}.$(SO)
-LIB_NAME_DBG := ${SO_NAME_DBG_BASE}.$(LIB)
-EXP_NAME_DBG := ${SO_NAME_DBG_BASE}.$(EXP)
-
-SO_NAME_OUT_DBG := $(OUTPUT_DIR_DBG)/${SO_NAME_DBG}
-LIB_NAME_OUT_DBG := $(OUTPUT_DIR_DBG)/${LIB_NAME_DBG}
-EXP_NAME_OUT_DBG := $(OUTPUT_DIR_DBG)/${EXP_NAME_DBG}
-
-SO_NAME_STLDBG_BASE := ${LIBNAME}_${STLDBG_SUFFIX}${MAJOR}${MINOR}
-SO_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}.$(SO)
-LIB_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}.$(LIB)
-EXP_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}.$(EXP)
-
-SO_NAME_OUT_STLDBG := $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG}
-LIB_NAME_OUT_STLDBG := $(OUTPUT_DIR_STLDBG)/${LIB_NAME_STLDBG}
-EXP_NAME_OUT_STLDBG := $(OUTPUT_DIR_STLDBG)/${EXP_NAME_STLDBG}
-
-# Static libraries:
-A_NAME := ${SO_NAME_BASE}_static.$(ARCH)
-A_NAME_OUT := $(OUTPUT_DIR_A)/$(A_NAME)
-
-A_NAME_DBG := ${SO_NAME_DBG_BASE}_static.$(ARCH)
-A_NAME_OUT_DBG := $(OUTPUT_DIR_A_DBG)/$(A_NAME_DBG)
-
-A_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}_static.$(ARCH)
-A_NAME_OUT_STLDBG := $(OUTPUT_DIR_A_STLDBG)/$(A_NAME_STLDBG)
Deleted: trunk/complement/explore/Makefiles/gmake/cygming/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/cygming/rules-install-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/cygming/rules-install-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,26 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/07/15 18:26:22 ptr>
-
-INSTALL_TAGS ?= install-release-shared install-dbg-shared install-stldbg-shared
-
-PHONY += install $(INSTALL_TAGS)
-
-install: $(INSTALL_TAGS)
-
-install-static: all-static install-release-static install-dbg-static install-stldbg-static
-install-shared: all-shared install-release-shared install-dbg-shared install-stldbg-shared
-
-install-release-shared: release-shared $(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR)
- $(INSTALL_SO) ${SO_NAME_OUT} $(INSTALL_BIN_DIR)
- $(INSTALL_SO) ${LIB_NAME_OUT} $(INSTALL_LIB_DIR)
-# $(INSTALL_SO) ${EXP_NAME_OUT} $(INSTALL_LIB_DIR)
-
-install-dbg-shared: dbg-shared $(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR_DBG)
- $(INSTALL_SO) ${SO_NAME_OUT_DBG} $(INSTALL_BIN_DIR)
- $(INSTALL_SO) ${LIB_NAME_OUT_DBG} $(INSTALL_LIB_DIR_DBG)
-# $(INSTALL_SO) ${EXP_NAME_OUT_DBG} $(INSTALL_LIB_DIR_DBG)
-
-install-stldbg-shared: stldbg-shared $(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR_STLDBG)
- $(INSTALL_SO) ${SO_NAME_OUT_STLDBG} $(INSTALL_BIN_DIR)
- $(INSTALL_SO) ${LIB_NAME_OUT_STLDBG} $(INSTALL_LIB_DIR_STLDBG)
-# $(INSTALL_SO) ${EXP_NAME_OUT_STLDBG} $(INSTALL_LIB_DIR_STLDBG)
-
Modified: trunk/complement/explore/Makefiles/gmake/darwin/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/darwin/lib.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/darwin/lib.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,5 +1,61 @@
-# -*- 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
+#
-include ${RULESBASE}/${USE_MAKE}/unix/lib.mak
+DBG_SUFFIX ?= g
+STLDBG_SUFFIX ?= stl${DBG_SUFFIX}
+# Shared libraries:
+
+SO_NAME := lib${LIBNAME}.$(SO)
+SO_NAMEx := lib${LIBNAME}.${MAJOR}.$(SO)
+SO_NAMExx := lib${LIBNAME}.${MAJOR}.${MINOR}.$(SO)
+SO_NAMExxx := lib${LIBNAME}.${MAJOR}.${MINOR}.${PATCH}.$(SO)
+
+SO_NAME_OUT := $(OUTPUT_DIR)/${SO_NAME}
+SO_NAME_OUTx := $(OUTPUT_DIR)/${SO_NAMEx}
+SO_NAME_OUTxx := $(OUTPUT_DIR)/${SO_NAMExx}
+SO_NAME_OUTxxx := $(OUTPUT_DIR)/${SO_NAMExxx}
+
+SO_NAME_DBG := lib${LIBNAME}${DBG_SUFFIX}.$(SO)
+SO_NAME_DBGx := lib${LIBNAME}${DBG_SUFFIX}.${MAJOR}.$(SO)
+SO_NAME_DBGxx := lib${LIBNAME}${DBG_SUFFIX}.${MAJOR}.${MINOR}.$(SO)
+SO_NAME_DBGxxx := lib${LIBNAME}${DBG_SUFFIX}.${MAJOR}.${MINOR}.${PATCH}.$(SO)
+
+SO_NAME_OUT_DBG := $(OUTPUT_DIR_DBG)/${SO_NAME_DBG}
+SO_NAME_OUT_DBGx := $(OUTPUT_DIR_DBG)/${SO_NAME_DBGx}
+SO_NAME_OUT_DBGxx := $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxx}
+SO_NAME_OUT_DBGxxx := $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxxx}
+
+ifndef WITHOUT_STLPORT
+SO_NAME_STLDBG := lib${LIBNAME}${STLDBG_SUFFIX}.$(SO)
+SO_NAME_STLDBGx := lib${LIBNAME}${STLDBG_SUFFIX}.${MAJOR}.$(SO)
+SO_NAME_STLDBGxx := lib${LIBNAME}${STLDBG_SUFFIX}.${MAJOR}.${MINOR}.$(SO)
+SO_NAME_STLDBGxxx := lib${LIBNAME}${STLDBG_SUFFIX}.${MAJOR}.${MINOR}.${PATCH}.$(SO)
+
+SO_NAME_OUT_STLDBG := $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG}
+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:
+
+A_NAME := lib${LIBNAME}.$(ARCH)
+A_NAME_OUT := $(OUTPUT_DIR_A)/$(A_NAME)
+
+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
Deleted: trunk/complement/explore/Makefiles/gmake/darwin/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/darwin/rules-install-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/darwin/rules-install-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,64 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/07/10 13:22:04 ptr>
-
-INSTALL_TAGS ?= install-release-shared install-dbg-shared install-stldbg-shared
-
-PHONY += install $(INSTALL_TAGS)
-
-install: $(INSTALL_TAGS)
-
-install-release-shared: release-shared $(INSTALL_LIB_DIR)
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAME} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAME}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMEx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMEx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMExx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR)/${SO_NAMExxx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUTxxx} $(INSTALL_LIB_DIR)
- (cd $(INSTALL_LIB_DIR) && \
- { ln -s ${SO_NAMExxx} ${SO_NAMExx}; \
- ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- ln -s ${SO_NAMEx} ${SO_NAME}; } )
-
-install-dbg-shared: dbg-shared $(INSTALL_LIB_DIR_DBG)
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_DBGxxx} $(INSTALL_LIB_DIR_DBG)
- (cd $(INSTALL_LIB_DIR_DBG) && \
- { ln -s ${SO_NAME_DBGxxx} ${SO_NAME_DBGxx}; \
- ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG}; } )
-
-install-stldbg-shared: stldbg-shared $(INSTALL_LIB_DIR_STLDBG)
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_STLDBGxxx} $(INSTALL_LIB_DIR_STLDBG)
- (cd $(INSTALL_LIB_DIR_STLDBG) && \
- { ln -s ${SO_NAME_STLDBGxxx} ${SO_NAME_STLDBGxx}; \
- ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG}; } )
Deleted: trunk/complement/explore/Makefiles/gmake/darwin/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/darwin/rules-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/darwin/rules-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,33 +0,0 @@
-# -*- makefile -*- Time-stamp: <05/03/28 23:42:07 ptr>
-# $Id$
-
-# Shared libraries tags
-
-PHONY += release-shared dbg-shared stldbg-shared
-
-release-shared: $(OUTPUT_DIR) ${SO_NAME_OUTxxx}
-
-dbg-shared: $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBGxxx}
-
-stldbg-shared: $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBGxxx}
-
-${SO_NAME_OUTxxx}: $(OBJ) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR); \
- rm -f ${SO_NAMExx}; ln -s $(SO_NAMExxx) ${SO_NAMExx}; \
- rm -f ${SO_NAMEx}; ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- rm -f ${SO_NAME}; ln -s ${SO_NAMEx} ${SO_NAME})
-
-${SO_NAME_OUT_DBGxxx}: $(OBJ_DBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_DBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_DBG); \
- rm -f ${SO_NAME_DBGxx}; ln -s $(SO_NAME_DBGxxx) ${SO_NAME_DBGxx}; \
- rm -f ${SO_NAME_DBGx}; ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- rm -f ${SO_NAME_DBG}; ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG})
-
-${SO_NAME_OUT_STLDBGxxx}: $(OBJ_STLDBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_STLDBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_STLDBG); \
- rm -f ${SO_NAME_STLDBGxx}; ln -s $(SO_NAME_STLDBGxxx) ${SO_NAME_STLDBGxx}; \
- rm -f ${SO_NAME_STLDBGx}; ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- rm -f ${SO_NAME_STLDBG}; ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG})
Deleted: trunk/complement/explore/Makefiles/gmake/freebsd/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/freebsd/lib.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/freebsd/lib.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,5 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/10/19 12:26:05 ptr>
-# $Id$
-
-include ${RULESBASE}/${USE_MAKE}/unix/lib.mak
-
Deleted: trunk/complement/explore/Makefiles/gmake/freebsd/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/freebsd/rules-install-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/freebsd/rules-install-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,64 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/07/10 13:22:04 ptr>
-
-INSTALL_TAGS ?= install-release-shared install-dbg-shared install-stldbg-shared
-
-PHONY += install $(INSTALL_TAGS)
-
-install: $(INSTALL_TAGS)
-
-install-release-shared: release-shared $(INSTALL_LIB_DIR)
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAME} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAME}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMEx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMEx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMExx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR)/${SO_NAMExxx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUTxxx} $(INSTALL_LIB_DIR)
- (cd $(INSTALL_LIB_DIR) && \
- { ln -s ${SO_NAMExxx} ${SO_NAMExx}; \
- ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- ln -s ${SO_NAMEx} ${SO_NAME}; } )
-
-install-dbg-shared: dbg-shared $(INSTALL_LIB_DIR_DBG)
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_DBGxxx} $(INSTALL_LIB_DIR_DBG)
- (cd $(INSTALL_LIB_DIR_DBG) && \
- { ln -s ${SO_NAME_DBGxxx} ${SO_NAME_DBGxx}; \
- ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG}; } )
-
-install-stldbg-shared: stldbg-shared $(INSTALL_LIB_DIR_STLDBG)
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_STLDBGxxx} $(INSTALL_LIB_DIR_STLDBG)
- (cd $(INSTALL_LIB_DIR_STLDBG) && \
- { ln -s ${SO_NAME_STLDBGxxx} ${SO_NAME_STLDBGxx}; \
- ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG}; } )
Deleted: trunk/complement/explore/Makefiles/gmake/freebsd/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/freebsd/rules-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/freebsd/rules-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,33 +0,0 @@
-# -*- makefile -*- Time-stamp: <05/03/28 23:42:07 ptr>
-# $Id$
-
-# Shared libraries tags
-
-PHONY += release-shared dbg-shared stldbg-shared
-
-release-shared: $(OUTPUT_DIR) ${SO_NAME_OUTxxx}
-
-dbg-shared: $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBGxxx}
-
-stldbg-shared: $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBGxxx}
-
-${SO_NAME_OUTxxx}: $(OBJ) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR); \
- rm -f ${SO_NAMExx}; ln -s $(SO_NAMExxx) ${SO_NAMExx}; \
- rm -f ${SO_NAMEx}; ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- rm -f ${SO_NAME}; ln -s ${SO_NAMEx} ${SO_NAME})
-
-${SO_NAME_OUT_DBGxxx}: $(OBJ_DBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_DBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_DBG); \
- rm -f ${SO_NAME_DBGxx}; ln -s $(SO_NAME_DBGxxx) ${SO_NAME_DBGxx}; \
- rm -f ${SO_NAME_DBGx}; ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- rm -f ${SO_NAME_DBG}; ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG})
-
-${SO_NAME_OUT_STLDBGxxx}: $(OBJ_STLDBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_STLDBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_STLDBG); \
- rm -f ${SO_NAME_STLDBGxx}; ln -s $(SO_NAME_STLDBGxxx) ${SO_NAME_STLDBGxx}; \
- rm -f ${SO_NAME_STLDBGx}; ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- rm -f ${SO_NAME_STLDBG}; ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG})
Deleted: trunk/complement/explore/Makefiles/gmake/hp-ux/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/hp-ux/lib.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/hp-ux/lib.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,5 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/10/19 12:26:05 ptr>
-# $Id$
-
-include ${RULESBASE}/${USE_MAKE}/unix/lib.mak
-
Deleted: trunk/complement/explore/Makefiles/gmake/hp-ux/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/hp-ux/rules-install-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/hp-ux/rules-install-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,65 +0,0 @@
-# -*- makefile -*- Time-stamp: <05/03/02 18:39:22 ptr>
-# $Id$
-
-INSTALL_TAGS ?= install-release-shared install-dbg-shared install-stldbg-shared
-
-PHONY += install $(INSTALL_TAGS)
-
-install: $(INSTALL_TAGS)
-
-install-release-shared: release-shared $(INSTALL_LIB_DIR)
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAME} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAME}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMEx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMEx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMExx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR)/${SO_NAMExxx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUTxxx} $(INSTALL_LIB_DIR)
- (cd $(INSTALL_LIB_DIR) && \
- { ln -s ${SO_NAMExxx} ${SO_NAMExx}; \
- ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- ln -s ${SO_NAMEx} ${SO_NAME}; } )
-
-install-dbg-shared: dbg-shared $(INSTALL_LIB_DIR_DBG)
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_DBGxxx} $(INSTALL_LIB_DIR_DBG)
- (cd $(INSTALL_LIB_DIR_DBG) && \
- { ln -s ${SO_NAME_DBGxxx} ${SO_NAME_DBGxx}; \
- ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG}; } )
-
-install-stldbg-shared: stldbg-shared $(INSTALL_LIB_DIR_STLDBG)
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_STLDBGxxx} $(INSTALL_LIB_DIR_STLDBG)
- (cd $(INSTALL_LIB_DIR_STLDBG) && \
- { ln -s ${SO_NAME_STLDBGxxx} ${SO_NAME_STLDBGxx}; \
- ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG}; } )
Deleted: trunk/complement/explore/Makefiles/gmake/hp-ux/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/hp-ux/rules-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/hp-ux/rules-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,33 +0,0 @@
-# -*- makefile -*- Time-stamp: <05/03/28 23:40:25 ptr>
-# $Id$
-
-# Shared libraries tags
-
-PHONY += release-shared dbg-shared stldbg-shared
-
-release-shared: $(OUTPUT_DIR) ${SO_NAME_OUTxxx}
-
-dbg-shared: $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBGxxx}
-
-stldbg-shared: $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBGxxx}
-
-${SO_NAME_OUTxxx}: $(OBJ) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR); \
- rm -f ${SO_NAMExx}; ln -s $(SO_NAMExxx) ${SO_NAMExx}; \
- rm -f ${SO_NAMEx}; ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- rm -f ${SO_NAME}; ln -s ${SO_NAMEx} ${SO_NAME})
-
-${SO_NAME_OUT_DBGxxx}: $(OBJ_DBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_DBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_DBG); \
- rm -f ${SO_NAME_DBGxx}; ln -s $(SO_NAME_DBGxxx) ${SO_NAME_DBGxx}; \
- rm -f ${SO_NAME_DBGx}; ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- rm -f ${SO_NAME_DBG}; ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG})
-
-${SO_NAME_OUT_STLDBGxxx}: $(OBJ_STLDBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_STLDBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_STLDBG); \
- rm -f ${SO_NAME_STLDBGxx}; ln -s $(SO_NAME_STLDBGxxx) ${SO_NAME_STLDBGxx}; \
- rm -f ${SO_NAME_STLDBGx}; ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- rm -f ${SO_NAME_STLDBG}; ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG})
Modified: trunk/complement/explore/Makefiles/gmake/lib/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/top.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/lib/top.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,12 +1,37 @@
# -*- makefile -*- Time-stamp: <03/10/10 16:15:53 ptr>
-# $Id$
+#
+# 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
+#
LDFLAGS ?=
+ifneq ("$(findstring $(OSNAME),darwin windows)","")
include ${RULESBASE}/${USE_MAKE}/${OSNAME}/lib.mak
+else
+include ${RULESBASE}/${USE_MAKE}/unix/lib.mak
+endif
+
include ${RULESBASE}/${USE_MAKE}/lib/${COMPILER_NAME}.mak
+
+ifneq ("$(findstring $(OSNAME),windows)","")
include ${RULESBASE}/${USE_MAKE}/${OSNAME}/rules-so.mak
+else
+include ${RULESBASE}/${USE_MAKE}/unix/rules-so.mak
+endif
+
include ${RULESBASE}/${USE_MAKE}/lib/rules-a.mak
+
+ifneq ("$(findstring $(OSNAME),windows)","")
include ${RULESBASE}/${USE_MAKE}/${OSNAME}/rules-install-so.mak
+else
+include ${RULESBASE}/${USE_MAKE}/unix/rules-install-so.mak
+endif
+
include ${RULESBASE}/${USE_MAKE}/lib/rules-install-a.mak
include ${RULESBASE}/${USE_MAKE}/lib/clean.mak
Deleted: trunk/complement/explore/Makefiles/gmake/linux/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/lib.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/linux/lib.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,5 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/10/19 12:26:05 ptr>
-# $Id$
-
-include ${RULESBASE}/${USE_MAKE}/unix/lib.mak
-
Deleted: trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,141 +0,0 @@
-# -*- makefile -*- Time-stamp: <07/02/07 14:58: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 INSTALL_TAGS
-
-ifndef _NO_SHARED_BUILD
-INSTALL_TAGS := install-release-shared
-else
-INSTALL_TAGS :=
-endif
-
-ifdef _STATIC_BUILD
-INSTALL_TAGS += install-release-static
-endif
-
-ifndef _NO_DBG_BUILD
-ifndef _NO_SHARED_BUILD
-INSTALL_TAGS += install-dbg-shared
-endif
-ifdef _STATIC_BUILD
-INSTALL_TAGS += install-dbg-static
-endif
-endif
-
-ifndef _NO_STLDBG_BUILD
-ifndef WITHOUT_STLPORT
-ifndef _NO_SHARED_BUILD
-INSTALL_TAGS += install-stldbg-shared
-endif
-ifdef _STATIC_BUILD
-INSTALL_TAGS += install-stldbg-static
-endif
-endif
-endif
-
-endif
-
-
-ifndef INSTALL_STRIP_TAGS
-
-ifndef _NO_SHARED_BUILD
-INSTALL_STRIP_TAGS := install-strip-shared
-else
-INSTALL_STRIP_TAGS :=
-endif
-
-ifdef _STATIC_BUILD
-INSTALL_STRIP_TAGS += install-release-static
-endif
-
-ifndef _NO_DBG_BUILD
-ifndef _NO_SHARED_BUILD
-INSTALL_STRIP_TAGS += install-dbg-shared
-endif
-ifdef _STATIC_BUILD
-INSTALL_STRIP_TAGS += install-dbg-static
-endif
-endif
-
-ifndef _NO_STLDBG_BUILD
-ifndef WITHOUT_STLPORT
-ifndef _NO_SHARED_BUILD
-INSTALL_STRIP_TAGS += install-stldbg-shared
-endif
-ifdef _STATIC_BUILD
-INSTALL_STRIP_TAGS += install-stldbg-static
-endif
-endif
-endif
-
-endif
-
-
-PHONY += install install-strip $(INSTALL_TAGS) $(INSTALL_STRIP_TAGS)
-
-install: $(INSTALL_TAGS)
-
-install-strip: $(INSTALL_STRIP_TAGS)
-
-# Workaround for GNU make 3.80; see comments in rules-so.mak
-define do_install_so_links
-$${INSTALL_LIB_DIR$(1)}/$${SO_NAME$(1)xxx}: $${SO_NAME_OUT$(1)xxx}
- $$(INSTALL_SO) $${SO_NAME_OUT$(1)xxx} $$(INSTALL_LIB_DIR$(1))
- @$(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)xx},$${SO_NAME$(1)xxx})
- @$(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)x},$${SO_NAME$(1)xx})
- @$(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)},$${SO_NAME$(1)x})
-endef
-
-# Workaround for GNU make 3.80; see comments in rules-so.mak
-define do_install_so_links_wk
-# expand to nothing, if equal
-ifneq (${INSTALL_LIB_DIR}/${SO_NAMExxx},${INSTALL_LIB_DIR_STLDBG}/${SO_NAME_STLDBGxxx})
-# expand to nothing, if WITHOUT_STLPORT
-ifndef WITHOUT_STLPORT
-$(call do_install_so_links,$(1))
-endif
-endif
-endef
-
-# Workaround for GNU make 3.80; see comments in rules-so.mak
-define do_install_so_links_wk2
-# expand to nothing, if equal
-ifneq (${INSTALL_LIB_DIR}/${SO_NAMExxx},${INSTALL_LIB_DIR_DBG}/${SO_NAME_DBGxxx})
-$(call do_install_so_links,$(1))
-endif
-endef
-
-
-$(eval $(call do_install_so_links,))
-# ifneq (${INSTALL_LIB_DIR}/${SO_NAMExxx},${INSTALL_LIB_DIR_DBG}/${SO_NAME_DBGxxx})
-# $(eval $(call do_install_so_links,_DBG))
-$(eval $(call do_install_so_links_wk2,_DBG))
-# endif
-# ifneq (${INSTALL_LIB_DIR}/${SO_NAMExxx},${INSTALL_LIB_DIR_STLDBG}/${SO_NAME_STLDBGxxx})
-# ifndef WITHOUT_STLPORT
-$(eval $(call do_install_so_links_wk,_STLDBG))
-# endif
-# endif
-
-install-release-shared: release-shared $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR)/${SO_NAMExxx}
- ${POST_INSTALL}
-
-install-strip-shared: release-shared $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR)/${SO_NAMExxx}
- ${STRIP} ${_SO_STRIP_OPTION} $(INSTALL_LIB_DIR)/${SO_NAMExxx}
- ${POST_INSTALL}
-
-install-dbg-shared: dbg-shared $(INSTALL_LIB_DIR_DBG) $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx}
- ${POST_INSTALL_DBG}
-
-ifndef WITHOUT_STLPORT
-install-stldbg-shared: stldbg-shared $(INSTALL_LIB_DIR_STLDBG) $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx}
- ${POST_INSTALL_STLDBG}
-endif
Deleted: trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,72 +0,0 @@
-# -*- makefile -*- Time-stamp: <06/12/12 09:43: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
-#
-
-# Shared libraries tags
-
-PHONY += release-shared dbg-shared stldbg-shared
-
-release-shared: $(EXTRA_PRE) $(OUTPUT_DIR) ${SO_NAME_OUTxxx} $(EXTRA_POST)
-
-dbg-shared: $(EXTRA_PRE_DBG) $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBGxxx} $(EXTRA_POST_DBG)
-
-ifndef WITHOUT_STLPORT
-stldbg-shared: $(EXTRA_PRE_STLDBG) $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBGxxx} $(EXTRA_POST_STLDBG)
-endif
-
-define do_so_links_1
-if [ -h $(1)/$(2) ]; then \
- if [ `readlink $(1)/$(2)` != "$(3)" ]; then \
- rm $(1)/$(2); \
- ln -s $(3) $(1)/$(2); \
- fi; \
-else \
- ln -s $(3) $(1)/$(2); \
-fi;
-endef
-
-# Workaround for GNU make 3.80: it fail on 'eval' within 'if'
-# directive after some level of complexity, i.e. after complex
-# rules it fails on code:
-#
-# $(eval $(call do_so_links,cc,))
-# $(eval $(call do_so_links,cc,_DBG))
-# ifndef WITHOUT_STLPORT
-# $(eval $(call do_so_links,cc,_STLDBG))
-# endif
-#
-# Put 'if' logic into defined macro looks as workaround.
-#
-# The GNU make 3.81 free from this problem, but it new...
-
-define do_so_links
-$${SO_NAME_OUT$(1)xxx}: $$(OBJ$(1)) $$(LIBSDEP)
-ifeq ("${_C_SOURCES_ONLY}","")
- $$(LINK.cc) $$(LINK_OUTPUT_OPTION) $${START_OBJ} $$(OBJ$(1)) $$(LDLIBS) $${STDLIBS} $${END_OBJ}
-else
- $$(LINK.c) $$(LINK_OUTPUT_OPTION) $$(OBJ$(1)) $$(LDLIBS)
-endif
- @$(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)xx},$${SO_NAME$(1)xxx})
- @$(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)x},$${SO_NAME$(1)xx})
- @$(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)},$${SO_NAME$(1)x})
-endef
-
-define do_so_links_wk
-# expand to nothing, if WITHOUT_STLPORT
-ifndef WITHOUT_STLPORT
-$(call do_so_links,$(1))
-endif
-endef
-
-$(eval $(call do_so_links,))
-$(eval $(call do_so_links,_DBG))
-# ifndef WITHOUT_STLPORT
-$(eval $(call do_so_links_wk,_STLDBG))
-# endif
Deleted: trunk/complement/explore/Makefiles/gmake/openbsd/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/openbsd/lib.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/openbsd/lib.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,5 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/10/19 12:26:05 ptr>
-# $Id$
-
-include ${RULESBASE}/${USE_MAKE}/unix/lib.mak
-
Deleted: trunk/complement/explore/Makefiles/gmake/openbsd/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/openbsd/rules-install-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/openbsd/rules-install-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,73 +0,0 @@
-# -*- makefile -*- Time-stamp: <04/03/16 17:22:33 ptr>
-
-INSTALL_TAGS ?= install-release-shared install-dbg-shared install-stldbg-shared
-
-PHONY += install $(INSTALL_TAGS)
-
-install: $(INSTALL_TAGS)
-
-install-release-shared: release-shared $(INSTALL_LIB_DIR)
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAME} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAME}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMEx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMEx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMExx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR)/${SO_NAMExxx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExxx}; \
- fi
- @if [ ! -d $(INSTALL_LIB_DIR) ] ; then \
- mkdir -p $(INSTALL_LIB_DIR) ; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUTxxx} $(INSTALL_LIB_DIR)
- (cd $(INSTALL_LIB_DIR) && \
- { ln -s ${SO_NAMExxx} ${SO_NAMExx}; \
- ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- ln -s ${SO_NAMEx} ${SO_NAME}; } )
-
-install-dbg-shared: dbg-shared $(INSTALL_LIB_DIR_DBG)
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx}; \
- fi
- @if [ ! -d $(INSTALL_LIB_DIR_DBG) ] ; then \
- mkdir -p $(INSTALL_LIB_DIR_DBG) ; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_DBGxxx} $(INSTALL_LIB_DIR_DBG)
- (cd $(INSTALL_LIB_DIR_DBG) && \
- { ln -s ${SO_NAME_DBGxxx} ${SO_NAME_DBGxx}; \
- ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG}; } )
-
-install-stldbg-shared: stldbg-shared $(INSTALL_LIB_DIR_STLDBG)
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx}; \
- fi
- @if [ ! -d $(INSTALL_LIB_DIR_STLDBG) ] ; then \
- mkdir -p $(INSTALL_LIB_DIR_STLDBG) ; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_STLDBGxxx} $(INSTALL_LIB_DIR_STLDBG)
- (cd $(INSTALL_LIB_DIR_STLDBG) && \
- { ln -s ${SO_NAME_STLDBGxxx} ${SO_NAME_STLDBGxx}; \
- ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG}; } )
Deleted: trunk/complement/explore/Makefiles/gmake/openbsd/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/openbsd/rules-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/openbsd/rules-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,33 +0,0 @@
-# -*- makefile -*- Time-stamp: <05/03/28 23:41:36 ptr>
-# $Id$
-
-# Shared libraries tags
-
-PHONY += release-shared dbg-shared stldbg-shared
-
-release-shared: $(OUTPUT_DIR) ${SO_NAME_OUTxxx}
-
-dbg-shared: $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBGxxx}
-
-stldbg-shared: $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBGxxx}
-
-${SO_NAME_OUTxxx}: $(OBJ) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR); \
- rm -f ${SO_NAMExx}; ln -s $(SO_NAMExxx) ${SO_NAMExx}; \
- rm -f ${SO_NAMEx}; ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- rm -f ${SO_NAME}; ln -s ${SO_NAMEx} ${SO_NAME})
-
-${SO_NAME_OUT_DBGxxx}: $(OBJ_DBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_DBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_DBG); \
- rm -f ${SO_NAME_DBGxx}; ln -s $(SO_NAME_DBGxxx) ${SO_NAME_DBGxx}; \
- rm -f ${SO_NAME_DBGx}; ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- rm -f ${SO_NAME_DBG}; ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG})
-
-${SO_NAME_OUT_STLDBGxxx}: $(OBJ_STLDBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_STLDBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_STLDBG); \
- rm -f ${SO_NAME_STLDBGxx}; ln -s $(SO_NAME_STLDBGxxx) ${SO_NAME_STLDBGxx}; \
- rm -f ${SO_NAME_STLDBGx}; ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- rm -f ${SO_NAME_STLDBG}; ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG})
Deleted: trunk/complement/explore/Makefiles/gmake/sunos/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/sunos/lib.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/sunos/lib.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,5 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/10/19 12:26:05 ptr>
-# $Id$
-
-include ${RULESBASE}/${USE_MAKE}/unix/lib.mak
-
Deleted: trunk/complement/explore/Makefiles/gmake/sunos/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/sunos/rules-install-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/sunos/rules-install-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,64 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/07/10 13:22:04 ptr>
-
-INSTALL_TAGS ?= install-release-shared install-dbg-shared install-stldbg-shared
-
-PHONY += install $(INSTALL_TAGS)
-
-install: $(INSTALL_TAGS)
-
-install-release-shared: release-shared $(INSTALL_LIB_DIR)
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAME} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAME}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMEx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMEx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMExx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR)/${SO_NAMExxx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUTxxx} $(INSTALL_LIB_DIR)
- (cd $(INSTALL_LIB_DIR) && \
- { ln -s ${SO_NAMExxx} ${SO_NAMExx}; \
- ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- ln -s ${SO_NAMEx} ${SO_NAME}; } )
-
-install-dbg-shared: dbg-shared $(INSTALL_LIB_DIR_DBG)
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_DBGxxx} $(INSTALL_LIB_DIR_DBG)
- (cd $(INSTALL_LIB_DIR_DBG) && \
- { ln -s ${SO_NAME_DBGxxx} ${SO_NAME_DBGxx}; \
- ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG}; } )
-
-install-stldbg-shared: stldbg-shared $(INSTALL_LIB_DIR_STLDBG)
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_STLDBGxxx} $(INSTALL_LIB_DIR_STLDBG)
- (cd $(INSTALL_LIB_DIR_STLDBG) && \
- { ln -s ${SO_NAME_STLDBGxxx} ${SO_NAME_STLDBGxx}; \
- ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG}; } )
Deleted: trunk/complement/explore/Makefiles/gmake/sunos/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/sunos/rules-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/sunos/rules-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,33 +0,0 @@
-# -*- makefile -*- Time-stamp: <05/03/28 23:42:45 ptr>
-# $Id$
-
-# Shared libraries tags
-
-PHONY += release-shared dbg-shared stldbg-shared
-
-release-shared: $(OUTPUT_DIR) ${SO_NAME_OUTxxx}
-
-dbg-shared: $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBGxxx}
-
-stldbg-shared: $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBGxxx}
-
-${SO_NAME_OUTxxx}: $(OBJ) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR); \
- rm -f ${SO_NAMExx}; ln -s $(SO_NAMExxx) ${SO_NAMExx}; \
- rm -f ${SO_NAMEx}; ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- rm -f ${SO_NAME}; ln -s ${SO_NAMEx} ${SO_NAME})
-
-${SO_NAME_OUT_DBGxxx}: $(OBJ_DBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_DBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_DBG); \
- rm -f ${SO_NAME_DBGxx}; ln -s $(SO_NAME_DBGxxx) ${SO_NAME_DBGxx}; \
- rm -f ${SO_NAME_DBGx}; ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- rm -f ${SO_NAME_DBG}; ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG})
-
-${SO_NAME_OUT_STLDBGxxx}: $(OBJ_STLDBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_STLDBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_STLDBG); \
- rm -f ${SO_NAME_STLDBGxx}; ln -s $(SO_NAME_STLDBGxxx) ${SO_NAME_STLDBGxx}; \
- rm -f ${SO_NAME_STLDBGx}; ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- rm -f ${SO_NAME_STLDBG}; ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG})
Modified: trunk/complement/explore/Makefiles/gmake/unix/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/unix/lib.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/unix/lib.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -14,34 +14,20 @@
# Shared libraries:
-ifeq ($(OSNAME),darwin)
SO_NAME := lib${LIBNAME}.$(SO)
-SO_NAMEx := lib${LIBNAME}.${MAJOR}.$(SO)
-SO_NAMExx := lib${LIBNAME}.${MAJOR}.${MINOR}.$(SO)
-SO_NAMExxx := lib${LIBNAME}.${MAJOR}.${MINOR}.${PATCH}.$(SO)
-else
-SO_NAME := lib${LIBNAME}.$(SO)
SO_NAMEx := ${SO_NAME}.${MAJOR}
SO_NAMExx := ${SO_NAMEx}.${MINOR}
SO_NAMExxx := ${SO_NAMExx}.${PATCH}
-endif
SO_NAME_OUT := $(OUTPUT_DIR)/${SO_NAME}
SO_NAME_OUTx := $(OUTPUT_DIR)/${SO_NAMEx}
SO_NAME_OUTxx := $(OUTPUT_DIR)/${SO_NAMExx}
SO_NAME_OUTxxx := $(OUTPUT_DIR)/${SO_NAMExxx}
-ifeq ($(OSNAME),darwin)
SO_NAME_DBG := lib${LIBNAME}${DBG_SUFFIX}.$(SO)
-SO_NAME_DBGx := lib${LIBNAME}${DBG_SUFFIX}.${MAJOR}.$(SO)
-SO_NAME_DBGxx := lib${LIBNAME}${DBG_SUFFIX}.${MAJOR}.${MINOR}.$(SO)
-SO_NAME_DBGxxx := lib${LIBNAME}${DBG_SUFFIX}.${MAJOR}.${MINOR}.${PATCH}.$(SO)
-else
-SO_NAME_DBG := lib${LIBNAME}${DBG_SUFFIX}.$(SO)
SO_NAME_DBGx := ${SO_NAME_DBG}.${MAJOR}
SO_NAME_DBGxx := ${SO_NAME_DBGx}.${MINOR}
SO_NAME_DBGxxx := ${SO_NAME_DBGxx}.${PATCH}
-endif
SO_NAME_OUT_DBG := $(OUTPUT_DIR_DBG)/${SO_NAME_DBG}
SO_NAME_OUT_DBGx := $(OUTPUT_DIR_DBG)/${SO_NAME_DBGx}
@@ -49,18 +35,10 @@
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)
-SO_NAME_STLDBGxx := lib${LIBNAME}${STLDBG_SUFFIX}.${MAJOR}.${MINOR}.$(SO)
-SO_NAME_STLDBGxxx := lib${LIBNAME}${STLDBG_SUFFIX}.${MAJOR}.${MINOR}.${PATCH}.$(SO)
-else
-SO_NAME_STLDBG := lib${LIBNAME}${STLDBG_SUFFIX}.$(SO)
SO_NAME_STLDBGx := ${SO_NAME_STLDBG}.${MAJOR}
SO_NAME_STLDBGxx := ${SO_NAME_STLDBGx}.${MINOR}
SO_NAME_STLDBGxxx := ${SO_NAME_STLDBGxx}.${PATCH}
-endif
SO_NAME_OUT_STLDBG := $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG}
SO_NAME_OUT_STLDBGx := $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGx}
Copied: trunk/complement/explore/Makefiles/gmake/unix/rules-install-so.mak (from rev 1535, trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak)
===================================================================
--- trunk/complement/explore/Makefiles/gmake/unix/rules-install-so.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/unix/rules-install-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -0,0 +1,141 @@
+# -*- makefile -*- Time-stamp: <07/02/07 14:58: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 INSTALL_TAGS
+
+ifndef _NO_SHARED_BUILD
+INSTALL_TAGS := install-release-shared
+else
+INSTALL_TAGS :=
+endif
+
+ifdef _STATIC_BUILD
+INSTALL_TAGS += install-release-static
+endif
+
+ifndef _NO_DBG_BUILD
+ifndef _NO_SHARED_BUILD
+INSTALL_TAGS += install-dbg-shared
+endif
+ifdef _STATIC_BUILD
+INSTALL_TAGS += install-dbg-static
+endif
+endif
+
+ifndef _NO_STLDBG_BUILD
+ifndef WITHOUT_STLPORT
+ifndef _NO_SHARED_BUILD
+INSTALL_TAGS += install-stldbg-shared
+endif
+ifdef _STATIC_BUILD
+INSTALL_TAGS += install-stldbg-static
+endif
+endif
+endif
+
+endif
+
+
+ifndef INSTALL_STRIP_TAGS
+
+ifndef _NO_SHARED_BUILD
+INSTALL_STRIP_TAGS := install-strip-shared
+else
+INSTALL_STRIP_TAGS :=
+endif
+
+ifdef _STATIC_BUILD
+INSTALL_STRIP_TAGS += install-release-static
+endif
+
+ifndef _NO_DBG_BUILD
+ifndef _NO_SHARED_BUILD
+INSTALL_STRIP_TAGS += install-dbg-shared
+endif
+ifdef _STATIC_BUILD
+INSTALL_STRIP_TAGS += install-dbg-static
+endif
+endif
+
+ifndef _NO_STLDBG_BUILD
+ifndef WITHOUT_STLPORT
+ifndef _NO_SHARED_BUILD
+INSTALL_STRIP_TAGS += install-stldbg-shared
+endif
+ifdef _STATIC_BUILD
+INSTALL_STRIP_TAGS += install-stldbg-static
+endif
+endif
+endif
+
+endif
+
+
+PHONY += install install-strip $(INSTALL_TAGS) $(INSTALL_STRIP_TAGS)
+
+install: $(INSTALL_TAGS)
+
+install-strip: $(INSTALL_STRIP_TAGS)
+
+# Workaround for GNU make 3.80; see comments in rules-so.mak
+define do_install_so_links
+$${INSTALL_LIB_DIR$(1)}/$${SO_NAME$(1)xxx}: $${SO_NAME_OUT$(1)xxx}
+ $$(INSTALL_SO) $${SO_NAME_OUT$(1)xxx} $$(INSTALL_LIB_DIR$(1))
+ @$(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)xx},$${SO_NAME$(1)xxx})
+ @$(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)x},$${SO_NAME$(1)xx})
+ @$(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)},$${SO_NAME$(1)x})
+endef
+
+# Workaround for GNU make 3.80; see comments in rules-so.mak
+define do_install_so_links_wk
+# expand to nothing, if equal
+ifneq (${INSTALL_LIB_DIR}/${SO_NAMExxx},${INSTALL_LIB_DIR_STLDBG}/${SO_NAME_STLDBGxxx})
+# expand to nothing, if WITHOUT_STLPORT
+ifndef WITHOUT_STLPORT
+$(call do_install_so_links,$(1))
+endif
+endif
+endef
+
+# Workaround for GNU make 3.80; see comments in rules-so.mak
+define do_install_so_links_wk2
+# expand to nothing, if equal
+ifneq (${INSTALL_LIB_DIR}/${SO_NAMExxx},${INSTALL_LIB_DIR_DBG}/${SO_NAME_DBGxxx})
+$(call do_install_so_links,$(1))
+endif
+endef
+
+
+$(eval $(call do_install_so_links,))
+# ifneq (${INSTALL_LIB_DIR}/${SO_NAMExxx},${INSTALL_LIB_DIR_DBG}/${SO_NAME_DBGxxx})
+# $(eval $(call do_install_so_links,_DBG))
+$(eval $(call do_install_so_links_wk2,_DBG))
+# endif
+# ifneq (${INSTALL_LIB_DIR}/${SO_NAMExxx},${INSTALL_LIB_DIR_STLDBG}/${SO_NAME_STLDBGxxx})
+# ifndef WITHOUT_STLPORT
+$(eval $(call do_install_so_links_wk,_STLDBG))
+# endif
+# endif
+
+install-release-shared: release-shared $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR)/${SO_NAMExxx}
+ ${POST_INSTALL}
+
+install-strip-shared: release-shared $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR)/${SO_NAMExxx}
+ ${STRIP} ${_SO_STRIP_OPTION} $(INSTALL_LIB_DIR)/${SO_NAMExxx}
+ ${POST_INSTALL}
+
+install-dbg-shared: dbg-shared $(INSTALL_LIB_DIR_DBG) $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx}
+ ${POST_INSTALL_DBG}
+
+ifndef WITHOUT_STLPORT
+install-stldbg-shared: stldbg-shared $(INSTALL_LIB_DIR_STLDBG) $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx}
+ ${POST_INSTALL_STLDBG}
+endif
Copied: trunk/complement/explore/Makefiles/gmake/unix/rules-so.mak (from rev 1535, trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak)
===================================================================
--- trunk/complement/explore/Makefiles/gmake/unix/rules-so.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/unix/rules-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -0,0 +1,72 @@
+# -*- makefile -*- Time-stamp: <06/12/12 09:43: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
+#
+
+# Shared libraries tags
+
+PHONY += release-shared dbg-shared stldbg-shared
+
+release-shared: $(EXTRA_PRE) $(OUTPUT_DIR) ${SO_NAME_OUTxxx} $(EXTRA_POST)
+
+dbg-shared: $(EXTRA_PRE_DBG) $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBGxxx} $(EXTRA_POST_DBG)
+
+ifndef WITHOUT_STLPORT
+stldbg-shared: $(EXTRA_PRE_STLDBG) $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBGxxx} $(EXTRA_POST_STLDBG)
+endif
+
+define do_so_links_1
+if [ -h $(1)/$(2) ]; then \
+ if [ `readlink $(1)/$(2)` != "$(3)" ]; then \
+ rm $(1)/$(2); \
+ ln -s $(3) $(1)/$(2); \
+ fi; \
+else \
+ ln -s $(3) $(1)/$(2); \
+fi;
+endef
+
+# Workaround for GNU make 3.80: it fail on 'eval' within 'if'
+# directive after some level of complexity, i.e. after complex
+# rules it fails on code:
+#
+# $(eval $(call do_so_links,cc,))
+# $(eval $(call do_so_links,cc,_DBG))
+# ifndef WITHOUT_STLPORT
+# $(eval $(call do_so_links,cc,_STLDBG))
+# endif
+#
+# Put 'if' logic into defined macro looks as workaround.
+#
+# The GNU make 3.81 free from this problem, but it new...
+
+define do_so_links
+$${SO_NAME_OUT$(1)xxx}: $$(OBJ$(1)) $$(LIBSDEP)
+ifeq ("${_C_SOURCES_ONLY}","")
+ $$(LINK.cc) $$(LINK_OUTPUT_OPTION) $${START_OBJ} $$(OBJ$(1)) $$(LDLIBS) $${STDLIBS} $${END_OBJ}
+else
+ $$(LINK.c) $$(LINK_OUTPUT_OPTION) $$(OBJ$(1)) $$(LDLIBS)
+endif
+ @$(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)xx},$${SO_NAME$(1)xxx})
+ @$(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)x},$${SO_NAME$(1)xx})
+ @$(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)},$${SO_NAME$(1)x})
+endef
+
+define do_so_links_wk
+# expand to nothing, if WITHOUT_STLPORT
+ifndef WITHOUT_STLPORT
+$(call do_so_links,$(1))
+endif
+endef
+
+$(eval $(call do_so_links,))
+$(eval $(call do_so_links,_DBG))
+# ifndef WITHOUT_STLPORT
+$(eval $(call do_so_links_wk,_STLDBG))
+# endif
Modified: trunk/complement/explore/Makefiles/gmake/windows/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/lib.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/windows/lib.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,4 +1,52 @@
# -*- makefile -*- Time-stamp: <03/07/15 18:23:04 ptr>
-# $Id$
+#
+# 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
+#
-include ../Makefiles/gmake/cygming/lib.mak
+RELEASE_SUFFIX := r
+DBG_SUFFIX := d
+STLDBG_SUFFIX := stl${DBG_SUFFIX}
+
+# Shared libraries:
+SO_NAME_BASE := ${LIBNAME}_${RELEASE_SUFFIX}${MAJOR}${MINOR}
+SO_NAME := ${SO_NAME_BASE}.$(SO)
+LIB_NAME := ${SO_NAME_BASE}.$(LIB)
+EXP_NAME := ${SO_NAME_BASE}.$(EXP)
+
+SO_NAME_OUT := $(OUTPUT_DIR)/${SO_NAME}
+LIB_NAME_OUT := $(OUTPUT_DIR)/${LIB_NAME}
+EXP_NAME_OUT := $(OUTPUT_DIR)/${EXP_NAME}
+
+SO_NAME_DBG_BASE := ${LIBNAME}_${DBG_SUFFIX}${MAJOR}${MINOR}
+SO_NAME_DBG := ${SO_NAME_DBG_BASE}.$(SO)
+LIB_NAME_DBG := ${SO_NAME_DBG_BASE}.$(LIB)
+EXP_NAME_DBG := ${SO_NAME_DBG_BASE}.$(EXP)
+
+SO_NAME_OUT_DBG := $(OUTPUT_DIR_DBG)/${SO_NAME_DBG}
+LIB_NAME_OUT_DBG := $(OUTPUT_DIR_DBG)/${LIB_NAME_DBG}
+EXP_NAME_OUT_DBG := $(OUTPUT_DIR_DBG)/${EXP_NAME_DBG}
+
+SO_NAME_STLDBG_BASE := ${LIBNAME}_${STLDBG_SUFFIX}${MAJOR}${MINOR}
+SO_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}.$(SO)
+LIB_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}.$(LIB)
+EXP_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}.$(EXP)
+
+SO_NAME_OUT_STLDBG := $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG}
+LIB_NAME_OUT_STLDBG := $(OUTPUT_DIR_STLDBG)/${LIB_NAME_STLDBG}
+EXP_NAME_OUT_STLDBG := $(OUTPUT_DIR_STLDBG)/${EXP_NAME_STLDBG}
+
+# Static libraries:
+A_NAME := ${SO_NAME_BASE}_static.$(ARCH)
+A_NAME_OUT := $(OUTPUT_DIR_A)/$(A_NAME)
+
+A_NAME_DBG := ${SO_NAME_DBG_BASE}_static.$(ARCH)
+A_NAME_OUT_DBG := $(OUTPUT_DIR_A_DBG)/$(A_NAME_DBG)
+
+A_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}_static.$(ARCH)
+A_NAME_OUT_STLDBG := $(OUTPUT_DIR_A_STLDBG)/$(A_NAME_STLDBG)
Modified: trunk/complement/explore/Makefiles/gmake/windows/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/rules-install-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/windows/rules-install-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,29 +1,21 @@
# -*- makefile -*- Time-stamp: <03/07/15 18:26:22 ptr>
+# $Id$
-INSTALL_TAGS ?= install-release-shared install-dbg-shared install-stldbg-shared
+INSTALL_TAGS ?= install-shared
PHONY += install $(INSTALL_TAGS)
install: $(INSTALL_TAGS)
-install-static: all-static install-release-static install-dbg-static install-stldbg-static
-install-shared: all-shared install-release-shared install-dbg-shared install-stldbg-shared
-
-install-release-shared: release-shared $(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR)
- @if not exist $(subst /,\,$(INSTALL_BIN_DIR)/) mkdir $(subst /,\,$(INSTALL_BIN_DIR)/)
- @if not exist $(subst /,\,$(INSTALL_LIB_DIR)/) mkdir $(subst /,\,$(INSTALL_LIB_DIR)/)
+install-release-shared: release-shared $(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR)
$(INSTALL_SO) $(subst /,\,$(SO_NAME_OUT)) $(subst /,\,$(INSTALL_BIN_DIR)/)
$(INSTALL_SO) $(subst /,\,$(LIB_NAME_OUT)) $(subst /,\,$(INSTALL_LIB_DIR)/)
-install-dbg-shared: dbg-shared $(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR_DBG)
- @if not exist $(subst /,\,$(INSTALL_BIN_DIR)/) mkdir $(subst /,\,$(INSTALL_BIN_DIR)/)
- @if not exist $(subst /,\,$(INSTALL_LIB_DIR_DBG)/) mkdir $(subst /,\,$(INSTALL_LIB_DIR_DBG)/)
+install-dbg-shared: dbg-shared $(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR_DBG)
$(INSTALL_SO) $(subst /,\,$(SO_NAME_OUT_DBG)) $(subst /,\,$(INSTALL_BIN_DIR)/)
$(INSTALL_SO) $(subst /,\,$(LIB_NAME_OUT_DBG)) $(subst /,\,$(INSTALL_LIB_DIR_DBG)/)
-install-stldbg-shared: stldbg-shared $(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR_STLDBG)
- @if not exist $(subst /,\,$(INSTALL_BIN_DIR)/) mkdir $(subst /,\,$(INSTALL_BIN_DIR)/)
- @if not exist $(subst /,\,$(INSTALL_LIB_DIR_STLDBG)/) mkdir $(subst /,\,$(INSTALL_LIB_DIR_STLDBG)/)
+install-stldbg-shared: stldbg-shared $(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR_STLDBG)
$(INSTALL_SO) $(subst /,\,$(SO_NAME_OUT_STLDBG)) $(subst /,\,$(INSTALL_BIN_DIR)/)
$(INSTALL_SO) $(subst /,\,$(LIB_NAME_OUT_STLDBG)) $(subst /,\,$(INSTALL_LIB_DIR_STLDBG)/)
Deleted: trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,4 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/10/27 18:15:05 ptr>
-# $Id$
-
-include ../Makefiles/gmake/cygming/rules-so.mak
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-08-30 14:32:59
|
Revision: 1712
http://complement.svn.sourceforge.net/complement/?rev=1712&view=rev
Author: complement
Date: 2007-08-30 07:32:49 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
MacOS X 10.4 with gcc
Modified Paths:
--------------
trunk/complement/explore/Makefiles/gmake/app/gcc.mak
trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
trunk/complement/explore/Makefiles/gmake/sysid.mak
Modified: trunk/complement/explore/Makefiles/gmake/app/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/gcc.mak 2007-08-30 14:20:07 UTC (rev 1711)
+++ trunk/complement/explore/Makefiles/gmake/app/gcc.mak 2007-08-30 14:32:49 UTC (rev 1712)
@@ -96,9 +96,25 @@
else
# otherwise, exceptions support is in libgcc_s.so
_LGCC_EH :=
+ifneq ($(OSNAME),darwin)
_LGCC_S := -lgcc_s
+else
+ifdef GCC_APPLE_CC
+ifeq ($(MACOSX_TEN_FIVE),true)
+_LGCC_S := -lgcc_s.10.5
+else
+_LGCC_S := -lgcc_s.10.4
endif
+else
+_LGCC_S := -lgcc_s
+# end of GCC_APPLE_CC
endif
+# end of Darwin
+endif
+# end of !USE_STATIC_LIBGCC
+endif
+# end of present libgcc_eh.a
+endif
# ifeq ($(CXX_VERSION_MAJOR),3)
ifeq ($(OSNAME),linux)
@@ -129,9 +145,28 @@
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
ifeq ($(OSNAME),darwin)
-START_OBJ := -lcrt1.o -lcrt2.o
+# sometimes crt3.o will required: it has __cxa_at_exit, but the same defined in libc.dyn
+# at least in Mac OS X 10.4.10 (8R2218)
+ifeq ($(CXX_VERSION_MAJOR),3)
+# i.e. gcc 3.3
+START_OBJ := $(shell for o in crt1.o crt2.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
+else
+ifndef USE_STATIC_LIBGCC
+# MacOS X, shared-libgcc
+ifeq ($(MACOSX_TEN_FIVE),true)
+# MacOS X >= 10.5
+START_OBJ := -lcrt1.o
+else
+# MacOS X < 10.5
+START_OBJ := -lcrt1.o
+endif
+else
+# MacOS X, not shared-libgcc
+START_OBJ := -lcrt1.o
+endif
+endif
END_OBJ :=
-STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lc -lm -lsupc++
+STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm -lsupc++ ${_LGCC_EH}
#LDFLAGS += -dynamic
endif
LDFLAGS += -nostdlib
Modified: trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2007-08-30 14:20:07 UTC (rev 1711)
+++ trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2007-08-30 14:32:49 UTC (rev 1712)
@@ -106,10 +106,34 @@
else
# otherwise, exceptions support is in libgcc_s.so
_LGCC_EH :=
+ifneq ($(OSNAME),darwin)
_LGCC_S := -lgcc_s
+else
+ifeq ($(MACOSX_TEN_FIVE),true)
+_LGCC_S := -lgcc_s.10.5
+else
+_LGCC_S := -lgcc_s.10.4
endif
+# end of Darwin
endif
+# end of !USE_STATIC_LIBGCC
+endif
+# end of present libgcc_eh.a
+endif
+_LSUPCPP := $(shell ${CXX} ${CXXFLAGS} -print-file-name=libsupc++.a)
+ifeq (${OSNAME},darwin)
+ifdef GCC_APPLE_CC
+_LSUPCPP := $(shell lipo ${_LSUPCPP} -thin ${M_ARCH} -output $(PRE_OUTPUT_DIR)/libsupc++.a && echo $(PRE_OUTPUT_DIR)/libsupc++.a)
+endif
+endif
+ifneq (${_LSUPCPP},libsupc++.a)
+_LSUPCPP_OBJ := $(shell $(AR) t ${_LSUPCPP})
+_LSUPCPP_AUX_OBJ := $(addprefix $(AUX_DIR)/,${_LSUPCPP_OBJ})
+_LSUPCPP_TSMP := .supc++
+_LSUPCPP_AUX_TSMP:= $(AUX_DIR)/$(_LSUPCPP_TSMP)
+endif
+
# ifeq ($(CXX_VERSION_MAJOR),3)
# Include whole language support archive (libsupc++.a) into libstlport:
# all C++ issues are in libstlport now.
@@ -142,10 +166,22 @@
STDLIBS := ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm -lrt
endif
ifeq ($(OSNAME),darwin)
+ifndef USE_STATIC_LIBGCC
+# MacOS X, shared-libgcc
+ifeq ($(MACOSX_TEN_FIVE),true)
+# MacOS X >= 10.5
START_OBJ :=
+else
+# MacOS X < 10.5
+START_OBJ :=
+endif
+else
+# MacOS X, not shared-libgcc
+START_OBJ :=
+endif
END_OBJ :=
ifdef GCC_APPLE_CC
-STDLIBS := ${STLPORT_LIB} -lgcc -lc -lm
+STDLIBS := ${STLPORT_LIB} ${_LGCC_S} -lc -lm
else
LDFLAGS += -single_module
STDLIBS := ${STLPORT_LIB} ${_LGCC_S} -lc -lm
Modified: trunk/complement/explore/Makefiles/gmake/sysid.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/sysid.mak 2007-08-30 14:20:07 UTC (rev 1711)
+++ trunk/complement/explore/Makefiles/gmake/sysid.mak 2007-08-30 14:32:49 UTC (rev 1712)
@@ -14,6 +14,10 @@
ifndef TARGET_OS
OSNAME := $(shell uname -s | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
+ifeq ($(OSNAME),darwin)
+OSREALNAME := $(shell sw_vers -productName | tr '[A-Z]' '[a-z]' | tr -d ', /\\()"')
+endif
+
# RedHat use nonstandard options for uname at least in cygwin,
# macro should be overwritten:
ifeq (cygwin,$(findstring cygwin,$(OSNAME)))
@@ -27,6 +31,9 @@
endif
OSREL := $(shell uname -r | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
+ifeq ($(OSNAME),darwin)
+OSREL := $(shell sw_vers -productVersion | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
+endif
M_ARCH := $(shell uname -m | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
ifeq ($(OSNAME),hp-ux)
P_ARCH := unknown
@@ -51,6 +58,12 @@
OSREL_MINOR := $(shell echo ${OSREL} | tr '.-' ' ' | awk '{print $$2;}')
endif
+ifeq ($(OSNAME),darwin)
+OSREL_MAJOR := $(shell echo ${OSREL} | tr '.-' ' ' | awk '{print $$1;}')
+OSREL_MINOR := $(shell echo ${OSREL} | tr '.-' ' ' | awk '{print $$2;}')
+MACOSX_TEN_FIVE := $(shell if [ ${OSREL_MAJOR} -lt 10 ]; then echo false; else if [ ${OSREL_MAJOR} -gt 10 ] ; then echo true; else if [ ${OSREL_MINOR} -lt 5 ]; then echo false; else echo true; fi; fi; fi)
+endif
+
# OS_VER := $(shell uname -s | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',_')
BUILD_SYSTEM := $(shell echo `uname -n` `uname -s` `uname -r` `uname -v` `uname -m` $$USER)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2008-06-12 12:58:27
|
Revision: 1895
http://complement.svn.sourceforge.net/complement/?rev=1895&view=rev
Author: complement
Date: 2008-06-12 05:57:36 -0700 (Thu, 12 Jun 2008)
Log Message:
-----------
sync with STLport for cygwin/mingw
Modified Paths:
--------------
trunk/complement/explore/Makefiles/gmake/app/gcc.mak
trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
Modified: trunk/complement/explore/Makefiles/gmake/app/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/gcc.mak 2008-06-12 12:55:26 UTC (rev 1894)
+++ trunk/complement/explore/Makefiles/gmake/app/gcc.mak 2008-06-12 12:57:36 UTC (rev 1895)
@@ -1,6 +1,6 @@
-# -*- Makefile -*- Time-stamp: <08/06/12 13:54:55 ptr>
+# -*- Makefile -*- Time-stamp: <08/06/12 16:01:09 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2008
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -63,6 +63,7 @@
ifndef WITHOUT_STLPORT
ifeq (${STLPORT_LIB_DIR},)
+ifneq ($(OSNAME),windows)
release-shared: STLPORT_LIB = -lstlport
release-static: STLPORT_LIB = -Wl,-Bstatic -lstlport -Wl,-Bdynamic
dbg-shared: STLPORT_LIB = -lstlportg
@@ -70,20 +71,27 @@
stldbg-shared: STLPORT_LIB = -lstlportstlg
stldbg-static: STLPORT_LIB = -Wl,-Bstatic -lstlportstlg -Wl,-Bdynamic
else
+LIB_VERSION = ${LIBMAJOR}.${LIBMINOR}
+release-shared : STLPORT_LIB = -lstlport.${LIB_VERSION}
+dbg-shared : STLPORT_LIB = -lstlportg.${LIB_VERSION}
+stldbg-shared : STLPORT_LIB = -lstlportstlg.${LIB_VERSION}
+endif
+else
+# STLPORT_LIB_DIR not empty
+ifneq ($(OSNAME),windows)
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)
+else
LIB_VERSION = ${LIBMAJOR}.${LIBMINOR}
-release-shared : STLPORT_LIB = -lstlport.${LIB_VERSION}
-dbg-shared : STLPORT_LIB = -lstlportg.${LIB_VERSION}
-stldbg-shared : STLPORT_LIB = -lstlportstlg.${LIB_VERSION}
+release-shared : STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlport.${LIB_VERSION}
+dbg-shared : STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlportg.${LIB_VERSION}
+stldbg-shared : STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlportstlg.${LIB_VERSION}
endif
+endif
endif
Modified: trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2008-06-12 12:55:26 UTC (rev 1894)
+++ trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2008-06-12 12:57:36 UTC (rev 1895)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <08/06/12 14:08:48 ptr>
+# -*- makefile -*- Time-stamp: <08/06/12 15:44:41 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005-2008
# Petr Ovtchenkov
@@ -73,21 +73,29 @@
ifndef WITHOUT_STLPORT
ifeq (${STLPORT_LIB_DIR},)
+ifneq ($(OSNAME),windows)
release-shared: STLPORT_LIB = -lstlport
dbg-shared: STLPORT_LIB = -lstlportg
stldbg-shared: STLPORT_LIB = -lstlportstlg
else
+LIB_VERSION = ${LIBMAJOR}.${LIBMINOR}
+release-shared: STLPORT_LIB = -lstlport.${LIB_VERSION}
+dbg-shared: STLPORT_LIB = -lstlportg.${LIB_VERSION}
+stldbg-shared: STLPORT_LIB = -lstlportstlg.${LIB_VERSION}
+endif
+else
+# STLPORT_LIB_DIR not empty
+ifneq ($(OSNAME),windows)
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)
+else
LIB_VERSION = ${LIBMAJOR}.${LIBMINOR}
-release-shared : STLPORT_LIB = -lstlport.${LIB_VERSION}
-dbg-shared : STLPORT_LIB = -lstlportg.${LIB_VERSION}
-stldbg-shared : STLPORT_LIB = -lstlportstlg.${LIB_VERSION}
+release-shared: STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlport.${LIB_VERSION}
+dbg-shared: STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlportg.${LIB_VERSION}
+stldbg-shared: STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlportstlg.${LIB_VERSION}
endif
+endif
endif
@@ -126,7 +134,7 @@
_LSUPCPP := $(shell ${CXX} ${CXXFLAGS} -print-file-name=libsupc++.a)
ifeq (${OSNAME},darwin)
ifdef GCC_APPLE_CC
-_LSUPCPP := $(shell lipo ${_LSUPCPP} -thin ${M_ARCH} -output $(PRE_OUTPUT_DIR)/libsupc++.a && echo $(PRE_OUTPUT_DIR)/libsupc++.a)
+_LSUPCPP := $(shell mkdir -p $(PRE_OUTPUT_DIR) && lipo ${_LSUPCPP} -thin ${M_ARCH} -output $(PRE_OUTPUT_DIR)/libsupc++.a && echo $(PRE_OUTPUT_DIR)/libsupc++.a)
endif
endif
ifneq (${_LSUPCPP},libsupc++.a)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X