reworked makefile