complement-svn

[complement-svn] SF.net SVN: complement: [1391] trunk/complement/explore/Makefiles/gmake/ linux

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

Revision: 1391
          http://svn.sourceforge.net/complement/?rev=1391&view=rev
Author:   complement
Date:     2006-11-03 06:01:48 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
fix typo; add semicolon; change point of disabling echo

Modified Paths:
--------------
    trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak
    trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak

Modified: trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak	2006-11-03 13:38:09 UTC (rev 1390)
+++ trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak	2006-11-03 14:01:48 UTC (rev 1391)
@@ -23,9 +23,9 @@
 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})
+	@$(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
 
 define do_install_so_links_wk

Modified: trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak	2006-11-03 13:38:09 UTC (rev 1390)
+++ trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak	2006-11-03 14:01:48 UTC (rev 1391)
@@ -22,14 +22,14 @@
 endif
 
 define do_so_links_1
-@if [ -h $(1)/$(2)} ] ; then \
+if [ -h $(1)/$(2) ]; then \
   if [ `readlink $(1)/$(2)` != "$(3)" ]; then \
     rm $(1)/$(2); \
     ln -s $(3) $(1)/$(2); \
-  fi \
+  fi; \
 else \
   ln -s $(3) $(1)/$(2); \
-fi
+fi;
 endef
 
 # Workaround for GNU make 3.80: it fail on 'eval' within 'if'
@@ -53,9 +53,9 @@
 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})
+	@$(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


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

[complement-svn] SF.net SVN: complement: [1396] trunk/complement/explore/Makefiles/gmake/ linux

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

Revision: 1396
          http://svn.sourceforge.net/complement/?rev=1396&view=rev
Author:   complement
Date:     2006-11-10 11:09:03 -0800 (Fri, 10 Nov 2006)

Log Message:
-----------
use strip, if requested; use proper install- tagets, depends upon config.mak

Modified Paths:
--------------
    trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak
    trunk/complement/explore/Makefiles/gmake/linux/sys.mak

Modified: trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak	2006-11-10 15:11:44 UTC (rev 1395)
+++ trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak	2006-11-10 19:09:03 UTC (rev 1396)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/11/03 11:47:01 ptr>
+# -*- makefile -*- Time-stamp: <06/11/10 18:42:44 ptr>
 #
 # Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
 # Petr Ovtchenkov
@@ -9,12 +9,40 @@
 # Licensed under the Academic Free License version 3.0
 #
 
-ifndef WITHOUT_STLPORT
-INSTALL_TAGS ?= install-release-shared install-dbg-shared install-stldbg-shared
+ifndef INSTALL_TAGS
+
+ifndef _NO_SHARED_BUILD
+INSTALL_TAGS := install-release-shared
 else
-INSTALL_TAGS ?= install-release-shared install-dbg-shared
+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
+
 PHONY += install $(INSTALL_TAGS)
 
 install:	$(INSTALL_TAGS)

Modified: trunk/complement/explore/Makefiles/gmake/linux/sys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/sys.mak	2006-11-10 15:11:44 UTC (rev 1395)
+++ trunk/complement/explore/Makefiles/gmake/linux/sys.mak	2006-11-10 19:09:03 UTC (rev 1396)
@@ -1,9 +1,21 @@
-# Time-stamp: <05/09/09 21:01:23 ptr>
-# $Id$
+# Time-stamp: <06/11/10 19:18:10 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
+#
 
 INSTALL := /usr/bin/install
 
-INSTALL_SO := ${INSTALL} -c -m 0755
+STRIP := /usr/bin/strip
+
+install-strip:	_INSTALL_STRIP_OPTION = -s
+
+INSTALL_SO := ${INSTALL} -c -m 0755 ${_INSTALL_STRIP_OPTION}
 INSTALL_A := ${INSTALL} -c -m 0644
 INSTALL_EXE := ${INSTALL} -c -m 0755
 


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