Bringing Makefile generation up to date.