rework makefile