further Makefile cleanup