makefile rework