Use new format of Makefile