Changed Makefile to be more generic