Implemented some of the new directives in Makefile recipe - but there's more to go.