Installer: Make sure that wixobj files are rebuilt for version changes

WixInstaller/Makefile

Index: WixInstaller/Makefile
===================================================================
--- a/WixInstaller/Makefile
+++ b/WixInstaller/Makefile
@@ -58,21 +58,21 @@ setup: $(Setup)
 Candle = candle -nologo -dNoDefault -dVersion=$(VERSION) "-dConfiguration=$(Configuration)" $(CANDLE_FLAGS) $(*F).wxs -out $@
 .wxs{$(Build_Dir_common)}.wixobj:
     $(Candle)
 .wxs{$(Build_Dir_ia32)}.wixobj:
     $(Candle) -arch x86
 .wxs{$(Build_Dir_x64)}.wixobj:
     $(Candle) -arch x64
 
-objects_common = $(Build_Dir_common)custom_WixUI_InstallDir.wixobj
-objects_ia32 = $(Build_Dir_ia32)adblockplusie.wixobj $(objects_common)
-objects_x64 = $(Build_Dir_x64)adblockplusie.wixobj $(objects_common)
+objects_common = $(Build_Dir_common)custom_WixUI_InstallDir-$(VERSION).wixobj
+objects_ia32 = $(Build_Dir_ia32)adblockplusie-$(VERSION).wixobj $(objects_common)
+objects_x64 = $(Build_Dir_x64)adblockplusie-$(VERSION).wixobj $(objects_common)

[Eric, 2013/06/14 14:39:10]

I don't think $(objects_ia32) and $(objects_x64) will build, because the
basename of the source and the version-modified basename of the target are no
longer the same.

You can add explicit rules for these, though, similar to what $(object_setup) is
doing.

$(objects_ia32): adblockplusie.wxs
    $(Candle) -arch x86

$(objects_x64): adblockplusie.wxs
    $(Candle) -arch x64

 
-object_setup = $(Build_Dir_common)setup.wixobj
+object_setup = $(Build_Dir_common)setup-$(VERSION).wixobj

[Eric, 2013/06/14 14:39:10]

This one will work because there's an explicit dependency rule for
$(object_setup) on line 71.

 $(object_setup): setup.wxs
     $(Candle) -ext WixBalExtension
 
 #---------------------
 # light .wixobj --> .msi
 #---------------------
 
 Light = light -notidy -nologo -cultures:en-us -loc en-us.wxl -ext WixUIExtension -out $@