Improved Makefile.