New better makefile!