Makefile fixes for CTL*Simulator