<more makefile edits