modifying makefile
moving things around