Improve Makefile to make it more standard and so that