Add these {R,M}akefile changes for AOK testing