more makefile related changes