various makefile changes