move parts into .make file