KAA-130: Updated makefile to support new macro