Improved makefile.