reworked Makefile: readded some functions