--- a/python/asm.py	Fri Apr 18 13:08:45 2014 +0200
+++ b/python/asm.py	Sat Apr 26 17:41:56 2014 +0200
@@ -1,7 +1,8 @@
 #!/usr/bin/env python3
 
 import argparse
-from ppci.assembler import Assembler
+from ppci.target.target_list import targets
+from ppci.buildfunctions import assemble
 
 if __name__ == '__main__':
     # When run as main file, try to grab command line arguments:
@@ -9,5 +10,4 @@
     parser.add_argument('sourcefile', type=argparse.FileType('r'),
         help='the source file to assemble')
     args = parser.parse_args()
-    a = Assembler()
-    obj = a.assemble(args.sourcefile.read())
+    obj = assemble(args.sourcefile, targets['arm'])