Updated the makefile to get more generic