Merge "Contain obj of ../ source files in their intermediate dir."