yet more makefile fixes