top-level Makefile improvements