Changed the order the makefile does things