Updated to generic Makefile.