Making Makefile more robust.