Makefile adjustements 3