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

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

Revision: 1961
          http://complement.svn.sourceforge.net/complement/?rev=1961&view=rev
Author:   complement
Date:     2008-09-08 19:54:20 +0000 (Mon, 08 Sep 2008)

Log Message:
-----------
corrected check of settings for builds without STLport

macro WITHOUT_STLPORT may be defined in gmake/extern.mak, if no
STLport macro detected; check and set macro that depends upon
WITHOUT_STLPORT (if it present) after gmake/extern.mak was included.

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

Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog	2008-08-14 18:25:31 UTC (rev 1960)
+++ trunk/complement/explore/Makefiles/ChangeLog	2008-09-08 19:54:20 UTC (rev 1961)
@@ -1,3 +1,8 @@
+2008-09-08  Petr Ovtchenkov  <pt...@vo...>
+
+	* gmake/top.mak: corrected check of settings for builds
+	without STLport.
+
 2008-06-16  Petr Ovtchenkov  <pt...@is...>
 
 	* gmake/subdirs.mak: function to pass tag for make in

Modified: trunk/complement/explore/Makefiles/gmake/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/top.mak	2008-08-14 18:25:31 UTC (rev 1960)
+++ trunk/complement/explore/Makefiles/gmake/top.mak	2008-09-08 19:54:20 UTC (rev 1961)
@@ -50,6 +50,25 @@
 endif
 endif
 
+endif
+
+all:	$(OUTPUT_DIRS) $(ALL_TAGS)
+
+ifndef OSNAME
+# identify OS and build date
+include ${RULESBASE}/gmake/sysid.mak
+endif
+# OS-specific definitions, like ln, install, etc. (guest host)
+include ${RULESBASE}/gmake/$(BUILD_OSNAME)/sys.mak
+# target OS-specific definitions, like ar, etc.
+include ${RULESBASE}/gmake/$(OSNAME)/targetsys.mak
+# Extern projects for everyday usage and settings for ones
+include ${RULESBASE}/gmake/extern.mak
+
+ifdef WITHOUT_STLPORT
+NOT_USE_NOSTDLIB := 1
+endif
+
 ifndef _NO_STLDBG_BUILD
 ifndef WITHOUT_STLPORT
 ifndef _NO_SHARED_BUILD
@@ -61,32 +80,14 @@
 endif
 endif
 
-endif
-
-all:	$(OUTPUT_DIRS) $(ALL_TAGS)
-
 ifndef WITHOUT_STLPORT
-all-static:	release-static	dbg-static	stldbg-static
-all-shared:	release-shared	dbg-shared	stldbg-shared
+all-static:	release-static dbg-static stldbg-static
+all-shared:	release-shared dbg-shared stldbg-shared
 else
-all-static:	release-static	dbg-static
-all-shared:	release-shared	dbg-shared
+all-static:	release-static dbg-static
+all-shared:	release-shared dbg-shared
 endif
 
-ifdef WITHOUT_STLPORT
-NOT_USE_NOSTDLIB := 1
-endif
-
-ifndef OSNAME
-# identify OS and build date
-include ${RULESBASE}/gmake/sysid.mak
-endif
-# OS-specific definitions, like ln, install, etc. (guest host)
-include ${RULESBASE}/gmake/$(BUILD_OSNAME)/sys.mak
-# target OS-specific definitions, like ar, etc.
-include ${RULESBASE}/gmake/$(OSNAME)/targetsys.mak
-# Extern projects for everyday usage and settings for ones
-include ${RULESBASE}/gmake/extern.mak
 # compiler, compiler options
 include ${RULESBASE}/gmake/$(COMPILER_NAME).mak
 # rules to make dirs for targets


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