1 files changed, 10 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct
index 7e0f323..64f2eca 100644
--- a/SConstruct
+++ b/SConstruct
@@ -251,30 +251,37 @@ elif env.get("bonjour", False) :
 		env["BONJOUR_FLAGS"] = bonjour_flags
 		env["BONJOUR_FLAGS"]["LIBS"] = ["dnssd"]
 	bonjour_conf.Finish()
 
 ################################################################################
 # Project files
+# FIXME: We need to explicitly list the order of libraries here, because of
+# the exported FLAGS. We should put FLAGS in separate SConscript files, and
+# read these in before anything else, such that we don't need to manually
+# list modules in order.
 ################################################################################
 
 # Third-party modules
 SConscript(dirs = [
 		"3rdParty/CppUnit",
 		"3rdParty/Boost",
 		"3rdParty/LibIDN",
 		"3rdParty/SQLite"])
 
 # Checker
 SConscript(dirs = ["QA/Checker"])
 
-# Swiften
-SConscript(dirs = "Swiften")
+# Libraries
+SConscript(dirs = [
+		"Swiften",
+		"SwifTools"
+	])
 
 # Projects
 for dir in os.listdir(".") :
-	if dir in ["QA", "Swiften"] :
+	if dir in ["QA", "Swiften", "SwifTools"] :
 		continue 
 	sconscript = os.path.join(dir, "SConscript")
 	if os.path.isfile(sconscript) :
 		SConscript(sconscript)
 
 # Unit test runner