Changes to makefile definition to reduce the chance of recursive execution