Made makefile more robust