additional makefile improvements