Update to new format of Makefile