Changing Makefile to be more flexible