Merge "Modified makefiles so that each makefile could build its own dependencies...