Reworked makefile again