Changed order of rules in the makefile to get precedence right.