update makefile to remove directories and expand