more makefile tidy