New and better makefile