Makefile changes for Frandom support