more makefile fixes