Merge "Add all and clean targets to makefile"