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

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

Revision: 1393
          http://svn.sourceforge.net/complement/?rev=1393&view=rev
Author:   complement
Date:     2006-11-03 08:25:19 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
fix issues WITHOUT_STLPORT

Modified Paths:
--------------
    trunk/complement/explore/Makefiles/gmake/depend.mak
    trunk/complement/explore/Makefiles/gmake/targetdirs.mak
    trunk/complement/explore/Makefiles/top.mak

Modified: trunk/complement/explore/Makefiles/gmake/depend.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/depend.mak	2006-11-03 15:15:59 UTC (rev 1392)
+++ trunk/complement/explore/Makefiles/gmake/depend.mak	2006-11-03 16:25:19 UTC (rev 1393)
@@ -1,21 +1,43 @@
-# Time-stamp: <06/08/24 10:09:17 ptr>
+# Time-stamp: <06/11/03 18:38:39 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 += release-static-dep release-shared-dep dbg-static-dep dbg-shared-dep \
-         stldbg-static-dep stldbg-shared-dep depend
+         depend
 
+ifndef WITHOUT_STLPORT
+PHONY += stldbg-static-dep stldbg-shared-dep
+endif
+
 release-static-dep release-shared-dep:	$(DEP)
 
 dbg-static-dep dbg-shared-dep:	$(DEP_DBG)
 
+ifndef WITHOUT_STLPORT
 stldbg-static-dep stldbg-shared-dep:	$(DEP_STLDBG)
 
-depend:	$(OUTPUT_DIRS) release-shared-dep dbg-shared-dep stldbg-shared-dep
-	@cat -s $(DEP) $(DEP_DBG) $(DEP_STLDBG) /dev/null > $(DEPENDS_COLLECTION)
+_ALL_DEP := $(DEP) $(DEP_DBG) $(DEP_STLDBG)
+_DASH_DEP := release-shared-dep dbg-shared-dep stldbg-shared-dep
+else
+_ALL_DEP := $(DEP) $(DEP_DBG)
+_DASH_DEP := release-shared-dep dbg-shared-dep
+endif
 
-TAGS:	$(OUTPUT_DIRS) release-shared-dep dbg-shared-dep stldbg-shared-dep
-	@etags -i -m `cat -s $(DEP) $(DEP_DBG) $(DEP_STLDBG) | sed 's/^.*://;s/\\\\$$//'`
 
-tags:	$(OUTPUT_DIRS) release-shared-dep dbg-shared-dep stldbg-shared-dep
-	@ctags -d -g -i -m -t `cat -s $(DEP) $(DEP_DBG) $(DEP_STLDBG) | sed 's/^.*://;s/\\\\$$//'`
+depend:	$(OUTPUT_DIRS) ${_DASH_DEP}
+	@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/\\\\$$//'`
+
+tags:	$(OUTPUT_DIRS) ${_DASH_DEP}
+	@ctags -d -g -i -m -t `cat -s $(_ALL_DEP) /dev/null | sed 's/^.*://;s/\\\\$$//'`
+
 -include $(DEPENDS_COLLECTION)

Modified: trunk/complement/explore/Makefiles/gmake/targetdirs.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/targetdirs.mak	2006-11-03 15:15:59 UTC (rev 1392)
+++ trunk/complement/explore/Makefiles/gmake/targetdirs.mak	2006-11-03 16:25:19 UTC (rev 1393)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/10/12 19:53:42 ptr>
+# Time-stamp: <06/11/03 18:47:05 ptr>
 #
 # Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
 # Petr Ovtchenkov
@@ -19,7 +19,9 @@
 PRE_OUTPUT_DIR         := $(BASE_OUTPUT_DIR)/$(TARGET_NAME)$(COMPILER_NAME)
 OUTPUT_DIR             := $(PRE_OUTPUT_DIR)/so$(EXTRA_DIRS)
 OUTPUT_DIR_DBG         := $(PRE_OUTPUT_DIR)/so_g$(EXTRA_DIRS)
+ifndef WITHOUT_STLPORT
 OUTPUT_DIR_STLDBG      := $(PRE_OUTPUT_DIR)/so_stlg$(EXTRA_DIRS)
+endif
 
 # file to store generated dependencies for make:
 DEPENDS_COLLECTION     := $(PRE_OUTPUT_DIR)/.make.depend
@@ -27,7 +29,9 @@
 # I use the same catalog, as for shared:
 OUTPUT_DIR_A           := $(OUTPUT_DIR)
 OUTPUT_DIR_A_DBG       := $(OUTPUT_DIR_DBG)
+ifndef WITHOUT_STLPORT
 OUTPUT_DIR_A_STLDBG    := $(OUTPUT_DIR_STLDBG)
+endif
 
 BASE_INSTALL_DIR       ?= ${SRCROOT}/build/$(TARGET_NAME)
 
@@ -36,16 +40,30 @@
 
 INSTALL_LIB_DIR        ?= ${BASE_INSTALL_LIB_DIR}lib
 INSTALL_LIB_DIR_DBG    ?= ${BASE_INSTALL_LIB_DIR}lib
+ifndef WITHOUT_STLPORT
 INSTALL_LIB_DIR_STLDBG ?= ${BASE_INSTALL_LIB_DIR}lib
+endif
 INSTALL_BIN_DIR        ?= ${BASE_INSTALL_BIN_DIR}bin
 INSTALL_BIN_DIR_DBG    ?= ${INSTALL_BIN_DIR}_g
+ifndef WITHOUT_STLPORT
 INSTALL_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR}_stlg
+endif
 
+ifndef WITHOUT_STLPORT
 OUTPUT_DIRS := $(OUTPUT_DIR) $(OUTPUT_DIR_DBG) $(OUTPUT_DIR_STLDBG) \
                $(OUTPUT_DIR_A) $(OUTPUT_DIR_A_DBG) $(OUTPUT_DIR_A_STLDBG)
+else
+OUTPUT_DIRS := $(OUTPUT_DIR) $(OUTPUT_DIR_DBG) \
+               $(OUTPUT_DIR_A) $(OUTPUT_DIR_A_DBG)
+endif
 
+ifndef WITHOUT_STLPORT
 INSTALL_LIB_DIRS := $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR_DBG) $(INSTALL_LIB_DIR_STLDBG)
 INSTALL_BIN_DIRS := $(INSTALL_BIN_DIR) $(INSTALL_BIN_DIR_DBG) $(INSTALL_BIN_DIR_STLDBG)
+else
+INSTALL_LIB_DIRS := $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR_DBG)
+INSTALL_BIN_DIRS := $(INSTALL_BIN_DIR) $(INSTALL_BIN_DIR_DBG)
+endif
 
 # sort will remove duplicates:
 OUTPUT_DIRS := $(sort $(OUTPUT_DIRS))

Modified: trunk/complement/explore/Makefiles/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/top.mak	2006-11-03 15:15:59 UTC (rev 1392)
+++ trunk/complement/explore/Makefiles/top.mak	2006-11-03 16:25:19 UTC (rev 1393)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/11/02 10:32:17 ptr>
+# Time-stamp: <06/11/03 18:54:08 ptr>
 #
 # Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
 # Petr Ovtchenkov
@@ -17,6 +17,9 @@
 
 RULESBASE ?= $(SRCROOT)/Makefiles
 
+# include file, generated by configure, if available
+-include ${RULESBASE}/config.mak
+
 ifndef WITHOUT_STLPORT
 ALL_TAGS ?= release-shared	dbg-shared	stldbg-shared
 else
@@ -33,9 +36,6 @@
 all-shared:	release-shared	dbg-shared
 endif
 
-# include file, generated by configure, if available
--include ${RULESBASE}/config.mak
-
 ifdef WITHOUT_STLPORT
 NOT_USE_NOSTDLIB := 1
 endif


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