Updated Makefile dependency order