I've updated the makefile a bit, please review the changes at your leisure