top-level Makefile improvements

No match.