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

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

Revision: 1397
          http://svn.sourceforge.net/complement/?rev=1397&view=rev
Author:   complement
Date:     2006-11-13 03:26:07 -0800 (Mon, 13 Nov 2006)

Log Message:
-----------
change tags related to clean processes (to satisfy 'standard' tagets); fix options for etags and ctags

Modified Paths:
--------------
    trunk/complement/explore/Makefiles/clean.mak
    trunk/complement/explore/Makefiles/gmake/app/clean.mak
    trunk/complement/explore/Makefiles/gmake/depend.mak
    trunk/complement/explore/Makefiles/gmake/lib/clean.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/linux/sys.mak

Modified: trunk/complement/explore/Makefiles/clean.mak
===================================================================
--- trunk/complement/explore/Makefiles/clean.mak	2006-11-10 19:09:03 UTC (rev 1396)
+++ trunk/complement/explore/Makefiles/clean.mak	2006-11-13 11:26:07 UTC (rev 1397)
@@ -1,7 +1,15 @@
-# -*- Makefile -*- Time-stamp: <03/07/15 12:19:04 ptr>
-# $Id$
+# -*- Makefile -*- Time-stamp: <06/11/11 01:06: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
+#
 
-PHONY += clean clobber distclean
+PHONY += clean distclean mostlyclean maintainer-clean uninstall
 
 clean::	
 	@-rm -f core core.*
@@ -9,7 +17,12 @@
 	@-rm -f $(OBJ_DBG) $(DEP_DBG)
 	@-rm -f $(OBJ_STLDBG) $(DEP_STLDBG)
 
-clobber::	clean
+distclean::	clean
+
+mostlyclean:	clean
 	@-rm -f $(DEPENDS_COLLECTION)
+	@-rm -f TAGS tags
 
-distclean::	clobber
+maintainer-clean:	distclean
+	@rm -f ${RULESBASE}/config.mak
+	@-rm -f TAGS tags

Modified: trunk/complement/explore/Makefiles/gmake/app/clean.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/clean.mak	2006-11-10 19:09:03 UTC (rev 1396)
+++ trunk/complement/explore/Makefiles/gmake/app/clean.mak	2006-11-13 11:26:07 UTC (rev 1397)
@@ -1,12 +1,24 @@
-# -*- makefile -*- Time-stamp: <03/07/10 00:20:54 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <06/11/11 00:43:13 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
+#
 
-clobber::
+clean::
 	@-rm -f ${PRG}
 	@-rm -f ${PRG_DBG}
 	@-rm -f ${PRG_STLDBG}
 
 distclean::
+	@-rm -f $(DEPENDS_COLLECTION)
+	@-rmdir -p ${OUTPUT_DIR} ${OUTPUT_DIR_DBG} ${OUTPUT_DIR_STLDBG} 2>/dev/null || exit 0
+
+uninstall:
 	@-rm -f $(INSTALL_BIN_DIR)/$(PRG)
 	@-rm -f $(INSTALL_BIN_DIR_DBG)/$(PRG_DBG)
 	@-rm -f $(INSTALL_BIN_DIR_STLDBG)/$(PRG_STLDBG)

Modified: trunk/complement/explore/Makefiles/gmake/depend.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/depend.mak	2006-11-10 19:09:03 UTC (rev 1396)
+++ trunk/complement/explore/Makefiles/gmake/depend.mak	2006-11-13 11:26:07 UTC (rev 1397)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/11/03 18:38:39 ptr>
+# Time-stamp: <06/11/11 01:04:15 ptr>
 #
 # Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
 # Petr Ovtchenkov
@@ -35,9 +35,9 @@
 	@cat -s $(_ALL_DEP) /dev/null > $(DEPENDS_COLLECTION)
 
 TAGS:	$(OUTPUT_DIRS) ${_DASH_DEP}
-	@etags -i -m `cat -s $(_ALL_DEP) /dev/null | sed 's/^.*://;s/\\\\$$//'`
+	@etags -i -m `cat -s $(_ALL_DEP) /dev/null | sed 's/^.*://;s/\\\\$$//' | uniq -u`
 
 tags:	$(OUTPUT_DIRS) ${_DASH_DEP}
-	@ctags -d -g -i -m -t `cat -s $(_ALL_DEP) /dev/null | sed 's/^.*://;s/\\\\$$//'`
+	@ctags -d --globals --declarations -t -w `cat -s $(_ALL_DEP) /dev/null | sed 's/^.*://;s/\\\\$$//' | uniq -u`
 
 -include $(DEPENDS_COLLECTION)

Modified: trunk/complement/explore/Makefiles/gmake/lib/clean.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/clean.mak	2006-11-10 19:09:03 UTC (rev 1396)
+++ trunk/complement/explore/Makefiles/gmake/lib/clean.mak	2006-11-13 11:26:07 UTC (rev 1397)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/10/12 19:53:46 ptr>
+# -*- makefile -*- Time-stamp: <06/11/11 00:43:08 ptr>
 #
 # Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
 # Petr Ovtchenkov
@@ -9,7 +9,7 @@
 # Licensed under the Academic Free License version 3.0
 #
 
-clobber::
+clean::
 	@-rm -f ${SO_NAME_OUT}
 	@-rm -f ${SO_NAME_OUTx}
 	@-rm -f ${SO_NAME_OUTxx}
@@ -25,7 +25,6 @@
 	@-rm -f ${A_NAME_OUT}
 	@-rm -f ${A_NAME_OUT_DBG}
 	@-rm -f ${A_NAME_OUT_STLDBG}
-	@-rmdir -p ${OUTPUT_DIR} ${OUTPUT_DIR_DBG} ${OUTPUT_DIR_STLDBG} 2>/dev/null || exit 0
 ifeq ($(OSNAME), cygming)
 	@-rm -f ${LIB_NAME_OUT}
 	@-rm -f ${LIB_NAME_OUT_DBG}
@@ -36,6 +35,10 @@
 endif
 
 distclean::
+	@-rm -f $(DEPENDS_COLLECTION)
+	@-rmdir -p ${OUTPUT_DIR} ${OUTPUT_DIR_DBG} ${OUTPUT_DIR_STLDBG} 2>/dev/null || exit 0
+
+uninstall:
 	@-rm -f $(INSTALL_LIB_DIR)/$(SO_NAME)
 	@-rm -f $(INSTALL_LIB_DIR)/$(SO_NAMEx)
 	@-rm -f $(INSTALL_LIB_DIR)/$(SO_NAMExx)
@@ -52,3 +55,4 @@
 	@-rm -f $(INSTALL_LIB_DIR_DBG)/${A_NAME_OUT_DBG}
 	@-rm -f $(INSTALL_LIB_DIR_STLDBG)/${A_NAME_OUT_STLDBG}
 	@-rmdir -p $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR_DBG) $(INSTALL_LIB_DIR_STLDBG) 2>/dev/null || exit 0
+

Modified: trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak	2006-11-10 19:09:03 UTC (rev 1396)
+++ trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak	2006-11-13 11:26:07 UTC (rev 1397)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/11/10 18:42:44 ptr>
+# -*- makefile -*- Time-stamp: <06/11/11 00:23:29 ptr>
 #
 # Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
 # Petr Ovtchenkov
@@ -43,14 +43,52 @@
 
 endif
 
-PHONY += install $(INSTALL_TAGS)
 
+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 forGNU 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))
+$${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})
@@ -72,6 +110,10 @@
 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}
 

Modified: trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak	2006-11-10 19:09:03 UTC (rev 1396)
+++ trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak	2006-11-13 11:26:07 UTC (rev 1397)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/11/03 11:45:22 ptr>
+# -*- makefile -*- Time-stamp: <06/11/11 00:23:27 ptr>
 #
 # Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
 # Petr Ovtchenkov

Modified: trunk/complement/explore/Makefiles/gmake/linux/sys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/sys.mak	2006-11-10 19:09:03 UTC (rev 1396)
+++ trunk/complement/explore/Makefiles/gmake/linux/sys.mak	2006-11-13 11:26:07 UTC (rev 1397)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/11/10 19:18:10 ptr>
+# Time-stamp: <06/11/10 23:43:27 ptr>
 #
 # Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
 # Petr Ovtchenkov
@@ -15,6 +15,8 @@
 
 install-strip:	_INSTALL_STRIP_OPTION = -s
 
+install-strip:	_SO_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.