move things around a bit in makefile