Sanitize the Makefiles some more. Use makes internal rules when
possible.