Continue makefile rework