Revised makefile.