Finished refactoring forgotten parts of Makefile.