another round of Makefile cleanup