fixed makefile, the whole thing should now compile