Update to use new Makefile API