Cleaning up the Makefile

1. We don't need @echo lines in every rule.
2. Moving some dependencies to where they actually belong.