Changed makefile to get all the necessary components