am 47a73363: Merge "Factor out some of the makefile cruft."

* commit '47a73363fcdb88811eedbe484720fb08dc30a995':
  Factor out some of the makefile cruft.