5 files changed, 110 insertions, 87 deletions
diff --git a/3rdParty/CAres/.gitignore b/3rdParty/CAres/.gitignore
new file mode 100644
index 0000000..a1a869c
--- /dev/null
+++ b/3rdParty/CAres/.gitignore
@@ -0,0 +1 @@
+include
diff --git a/Limber/SConscript b/Limber/SConscript
index 7d8c849..e766f97 100644
--- a/Limber/SConscript
+++ b/Limber/SConscript
@@ -1,11 +1,12 @@
 Import("env")
 
-myenv = env.Clone()
-myenv.MergeFlags(env["SWIFTEN_FLAGS"])
-myenv.MergeFlags(env["LIBIDN_FLAGS"])
-myenv.MergeFlags(env.get("LIBXML_FLAGS", ""))
-myenv.MergeFlags(env.get("EXPAT_FLAGS", ""))
-myenv.MergeFlags(env["OPENSSL_FLAGS"])
-myenv.MergeFlags(env["BOOST_FLAGS"])
+if env["SCONS_STAGE"] == "build" :
+	myenv = env.Clone()
+	myenv.MergeFlags(env["SWIFTEN_FLAGS"])
+	myenv.MergeFlags(env["LIBIDN_FLAGS"])
+	myenv.MergeFlags(env.get("LIBXML_FLAGS", ""))
+	myenv.MergeFlags(env.get("EXPAT_FLAGS", ""))
+	myenv.MergeFlags(env["OPENSSL_FLAGS"])
+	myenv.MergeFlags(env["BOOST_FLAGS"])
 
-myenv.Program("limber", ["main.cpp"])
+	myenv.Program("limber", ["main.cpp"])
diff --git a/SwifTools/SConscript b/SwifTools/SConscript
index a1b3d18..3400e54 100644
--- a/SwifTools/SConscript
+++ b/SwifTools/SConscript
@@ -1,42 +1,52 @@
 Import("env")
 
-env["SWIFTOOLS_FLAGS"] = {
-		"LIBPATH": [Dir(".")],
-		"LIBS": ["SwifTools"]
-	}
-
-myenv = env.Clone()
-myenv.MergeFlags(myenv["BOOST_FLAGS"])
-
-sources = [
-		"Idle/IdleDetector.cpp",
-		"Idle/ActualIdleDetector.cpp",
-		"Idle/IdleQuerier.cpp",
-		"Idle/PlatformIdleQuerier.cpp",
-		"AutoUpdater/AutoUpdater.cpp",
-		"AutoUpdater/PlatformAutoUpdaterFactory.cpp",
-		"Linkify.cpp",
-	]
-
-if myenv.get("HAVE_SPARKLE", 0) :
-	myenv.MergeFlags(myenv["SPARKLE_FLAGS"])
-	myenv.Append(CPPDEFINES = ["HAVE_SPARKLE"])
-	sources += ["AutoUpdater/SparkleAutoUpdater.mm"]
-
-if myenv["PLATFORM"] == "win32" :
-	sources += ["Idle/WindowsIdleQuerier.cpp"]
-elif myenv["PLATFORM"] == "darwin" :
-	sources += ["Idle/MacOSXIdleQuerier.cpp"]
-elif myenv["HAVE_XSS"] :
-	myenv.Append(CPPDEFINES = ["HAVE_XSS"])
-	sources += ["Idle/XSSIdleQuerier.cpp"]
-else :
-  sources += ["Idle/DummyIdleQuerier.cpp"]
-
-myenv.StaticLibrary("SwifTools", sources)
-
-SConscript(dirs = [
-		"Idle/IdleQuerierTest",
-		"Idle/UnitTest",
-		"UnitTest"
-	])
+################################################################################
+# Flags
+################################################################################
+
+if env["SCONS_STAGE"] == "flags" :
+	env["SWIFTOOLS_FLAGS"] = {
+			"LIBPATH": [Dir(".")],
+			"LIBS": ["SwifTools"]
+		}
+
+################################################################################
+# Build
+################################################################################
+
+if env["SCONS_STAGE"] == "build" :
+	myenv = env.Clone()
+	myenv.MergeFlags(myenv["BOOST_FLAGS"])
+
+	sources = [
+			"Idle/IdleDetector.cpp",
+			"Idle/ActualIdleDetector.cpp",
+			"Idle/IdleQuerier.cpp",
+			"Idle/PlatformIdleQuerier.cpp",
+			"AutoUpdater/AutoUpdater.cpp",
+			"AutoUpdater/PlatformAutoUpdaterFactory.cpp",
+			"Linkify.cpp",
+		]
+
+	if myenv.get("HAVE_SPARKLE", 0) :
+		myenv.MergeFlags(myenv["SPARKLE_FLAGS"])
+		myenv.Append(CPPDEFINES = ["HAVE_SPARKLE"])
+		sources += ["AutoUpdater/SparkleAutoUpdater.mm"]
+
+	if myenv["PLATFORM"] == "win32" :
+		sources += ["Idle/WindowsIdleQuerier.cpp"]
+	elif myenv["PLATFORM"] == "darwin" :
+		sources += ["Idle/MacOSXIdleQuerier.cpp"]
+	elif myenv["HAVE_XSS"] :
+		myenv.Append(CPPDEFINES = ["HAVE_XSS"])
+		sources += ["Idle/XSSIdleQuerier.cpp"]
+	else :
+		sources += ["Idle/DummyIdleQuerier.cpp"]
+
+	myenv.StaticLibrary("SwifTools", sources)
+
+	SConscript(dirs = [
+			"Idle/IdleQuerierTest",
+			"Idle/UnitTest",
+			"UnitTest"
+		])
diff --git a/Swift/Controllers/SConscript b/Swift/Controllers/SConscript
index bd2c16e..8c12c50 100644
--- a/Swift/Controllers/SConscript
+++ b/Swift/Controllers/SConscript
@@ -1,36 +1,46 @@
 Import("env")
 
-env["SWIFT_CONTROLLERS_FLAGS"] = {
-		"LIBPATH": [Dir(".")],
-		"LIBS": ["SwiftControllers"]
-	}
+################################################################################
+# Flags
+################################################################################
 
-myenv = env.Clone()
-myenv.MergeFlags(env["BOOST_FLAGS"])
-myenv.StaticLibrary("SwiftControllers", [
-		"Chat/ChatController.cpp",
-		"Chat/ChatControllerBase.cpp",
-		"Chat/ChatsManager.cpp",
-		"MainController.cpp",
-		"NickResolver.cpp",
-		"RosterController.cpp",
-		"XMPPRosterController.cpp",
-		"Chat/MUCController.cpp",
-		"EventController.cpp",
-		"EventWindowController.cpp",
-		"SoundEventController.cpp",
-		"SystemTrayController.cpp",
-		"XMLConsoleController.cpp",
-		"UIEvents/UIEvent.cpp",
-		"UIInterfaces/XMLConsoleWidget.cpp",
-		"PreviousStatusStore.cpp",
-	])
+if env["SCONS_STAGE"] == "flags" :
+	env["SWIFT_CONTROLLERS_FLAGS"] = {
+			"LIBPATH": [Dir(".")],
+			"LIBS": ["SwiftControllers"]
+		}
 
-env.Append(UNITTEST_SOURCES = [
-		File("UnitTest/NickResolverTest.cpp"),
-		File("UnitTest/RosterControllerTest.cpp"),
-		File("UnitTest/XMPPRosterControllerTest.cpp"),
-		File("UnitTest/PreviousStatusStoreTest.cpp"),
-		File("Chat/UnitTest/ChatsManagerTest.cpp"),
-		File("UnitTest/MockChatWindow.cpp"),
-	])
+################################################################################
+# Build
+################################################################################
+
+if env["SCONS_STAGE"] == "build" :
+	myenv = env.Clone()
+	myenv.MergeFlags(env["BOOST_FLAGS"])
+	myenv.StaticLibrary("SwiftControllers", [
+			"Chat/ChatController.cpp",
+			"Chat/ChatControllerBase.cpp",
+			"Chat/ChatsManager.cpp",
+			"MainController.cpp",
+			"NickResolver.cpp",
+			"RosterController.cpp",
+			"XMPPRosterController.cpp",
+			"Chat/MUCController.cpp",
+			"EventController.cpp",
+			"EventWindowController.cpp",
+			"SoundEventController.cpp",
+			"SystemTrayController.cpp",
+			"XMLConsoleController.cpp",
+			"UIEvents/UIEvent.cpp",
+			"UIInterfaces/XMLConsoleWidget.cpp",
+			"PreviousStatusStore.cpp",
+		])
+
+	env.Append(UNITTEST_SOURCES = [
+			File("UnitTest/NickResolverTest.cpp"),
+			File("UnitTest/RosterControllerTest.cpp"),
+			File("UnitTest/XMPPRosterControllerTest.cpp"),
+			File("UnitTest/PreviousStatusStoreTest.cpp"),
+			File("Chat/UnitTest/ChatsManagerTest.cpp"),
+			File("UnitTest/MockChatWindow.cpp"),
+		])
diff --git a/Swift/SConscript b/Swift/SConscript
index 1460091..8f1fa26 100644
--- a/Swift/SConscript
+++ b/Swift/SConscript
@@ -2,14 +2,15 @@ import datetime
 
 Import("env")
 
-if not GetOption("help") and not env.get("HAVE_OPENSSL", 0) :
-  print "Error: Swift requires OpenSSL support, and OpenSSL was not found."
-  Exit(1)
+SConscript("Controllers/SConscript")
 
+if env["SCONS_STAGE"] == "build" :
+	if not GetOption("help") and not env.get("HAVE_OPENSSL", 0) :
+		print "Error: Swift requires OpenSSL support, and OpenSSL was not found."
+		Exit(1)
 
-env["SWIFT_VERSION"] = "0.9.9." + datetime.date.today().strftime("%Y%m%d")
 
-SConscript("Controllers/SConscript")
+	env["SWIFT_VERSION"] = "0.9.9." + datetime.date.today().strftime("%Y%m%d")
 
-if env["target"] == "native":
-   SConscript("QtUI/SConscript")
+	if env["target"] == "native":
+		 SConscript("QtUI/SConscript")