diff --git a/Sconstruct b/Sconstruct
index a4b84a71..3f6e2249 100644
--- a/Sconstruct
+++ b/Sconstruct
@@ -26,19 +26,25 @@ if ARGUMENTS.get('VERBOSE') != "1":
 	env.Append(LINKCOMSTR = "Linking $TARGET")
 env.Append(CPPPATH = "include")
 
-env.ParseConfig('pkg-config --cflags --libs gtk+-2.0')
 env.ParseConfig('pkg-config --cflags --libs gstreamer-0.10')
 env.ParseConfig('pkg-config --cflags --libs gstreamer-interfaces-0.10')
 env.ParseConfig('pkg-config --cflags --libs taglib')
 
-Export("env", "MAJOR", "MINOR", "BUG", "EXTRA", "DEBUG")
+Export("env", "MAJOR", "MINOR", "BUG", "EXTRA")
+
+def use_dirs(dirs):
+	objs = []
+	for dir in dirs:
+		files = SConscript("%s/Sconscript" % dir)
+		objs.append(files)
+	return objs
 
 def list_dirs(directory):
 	import os
 	dirs  = [x[0] for x in os.walk(directory)]
 	return [Glob(dir + "/*.cpp") for dir in dirs]
 
-ocarina=env.Program('ocarina.bin', list_dirs('libsaria') + list_dirs('ocarina'))
+ocarina=env.Program('ocarina.bin', list_dirs('libsaria') + use_dirs(["ocarina"]))
 SConscript(['include/Sconscript'])
 Default([ocarina])
 
diff --git a/ocarina/Sconscript b/ocarina/Sconscript
new file mode 100644
index 00000000..365dd944
--- /dev/null
+++ b/ocarina/Sconscript
@@ -0,0 +1,10 @@
+#!/usr/bin/python
+import os
+Import('env')
+
+env.ParseConfig('pkg-config --cflags --libs gtk+-2.0')
+
+dirs  = [x[0] for x in os.walk(".")]
+files = [Glob(dir + "/*.cpp") for dir in dirs]
+
+Return('files')