Merge "Factor out some of the makefile cruft."