--- a/kernel/build.xml	Wed Feb 18 22:56:42 2015 +0100
+++ b/kernel/build.xml	Thu Feb 19 00:13:07 2015 +0100
@@ -9,24 +9,20 @@
         <build file="../user/build.xml" />
 
         <assemble source="arch/qemu_vexpress/start.asm"
-            target="arm" output="start.o" />
+            target="arm" output="obj/start.o" />
 
         <assemble source="ramdisk.asm"
-            target="arm" output="ramdisk.o" />
+            target="arm" output="obj/ramdisk.o" />
 
-        <compile target="arm"
-            sources='arch/qemu_vexpress/vexpressA9.c3'
-            includes="${src}/*.c3" output="vexp.o" />
-
-        <compile target="arm" sources='${src}/*.c3'
-            output="henkie.o" />
+        <compile target="arm" sources='*.c3;arch/qemu_vexpress/vexpressA9.c3'
+            output="obj/kernel.o" />
 
         <!-- <script file="gen_table.py" /> -->
 
-        <link output="kernel.o"
+        <link output="obj/kernel.elf"
             target="arm"
             layout="arch/qemu_vexpress/layout.mmap"
-            objects="henkie.o;vexp.o;start.o;ramdisk.o" />
+            objects="obj/kernel.o;start.o;ramdisk.o" />
 
         <objcopy
             objectfile="kernel.o"