Evolve Makefile a bit