Redo makefile deduplication