Dusan Baljevic Makefile changes