rework Makefile