more makefile improvements