Removed some redundancies in the main Makefile.