Making Make smarter
Merge branch 'building-whats-needed'
Importing updated Makefile