--- a/user/build.xml	Wed Feb 18 22:56:42 2015 +0100
+++ b/user/build.xml	Thu Feb 19 00:13:07 2015 +0100
@@ -3,35 +3,30 @@
     <target name="all" depends="hello,init">
     </target>
 
-    <target name="lib">
-        <compile sources="lib.c3;ipc.c3" target="arm" output="lib.o"/>
-    </target>
-
-    <target name="hello" depends="lib">
-        <compile sources="hello.c3"
-                 includes="lib.c3;ipc.c3"
+    <target name="hello">
+        <compile sources="hello.c3;lib/*.c3"
                  target="arm"
-                 output="hello.o"/>
-        <link output="hello" layout="app.mmap"
+                 output="obj/hello.o"/>
+        <link output="obj/hello.elf" layout="app.mmap"
             target="arm"
-            objects="hello.o;lib.o"/>
+            objects="obj/hello.o"/>
     </target>
 
     <target name="init">
-        <compile sources="init.c3"
-            includes="lib.c3;ipc.c3"
+        <compile sources="init/init.c3;lib/*.c3"
             target="arm"
-            output="init.o"/>
+            output="obj/init.o"/>
 
         <link
-            output="init"
+            output="obj/init.elf"
             layout="app.mmap"
             target="arm"
-            objects="init.o;lib.o" />
+            objects="obj/init.o" />
 
-        <objcopy objectfile="init"
+        <objcopy objectfile="obj/init.elf"
             imagename="flash"
-            output="init.bin" />
+            format="bin"
+            output="obj/init.bin" />
     </target>
 </project>