More main Makefile changes.