Updated makefiles to new makefile system.