wrap makefile, take 2