Makefile updated (rcmd's Makefile is merged to the aws's one)