Reworked makefile