some more makefile cleanup