All of this cruft has been cleaned up in some of the previous makefile iterations.