Updated Makefile to include more demo combinations.