Also moved Makefile to GNUmakefile.