Fixed problems with Makefile