Hopefully the last of the makefile cleanup