Updated Makefile for more asap switches.