Try harder to avoid duplicate object files with VS60.
Merge topic 'target-sources-refactor' into next

0ff680be Try harder to avoid duplicate object files with VS60.