Adapted makefile
More adaptations done