Another makefile redo