Bug 1354785 - Add dependency on manifest files to res files. r=gps

Before bug 1348069, MS manifest tool was used to embed manifest files.[1]

The Makefile used to use EXTRA_DEPS to invoke the manifest tool when a manifest files is changed. But it is no longer effective because the manifest file namepattern is no longer $@.exe.manifest.

Now manifest files will be embedded via .res files. So we have to rebuild .res files to update embedded manifests.

[1] https://dxr.mozilla.org/mozilla-central/rev/35c7be9c2db288d1d449e3cc586c4164d642c5fd/config/rules.mk#642-655

MozReview-Commit-ID: 5QiXVeImZdY

--HG--
extra : rebase_source : 9e321e30ecd389ef0aa21e438d321e79edf0a009

browser/app/Makefile.in

@@ -32,22 +32,22 @@ CXXFLAGS += -mno-sse -mno-sse2 -mfpmath=387
 CXX += -march=pentiumpro
 endif
 
-ifeq ($(OS_ARCH),WINNT)
-# Rebuild firefox.exe if the manifest changes - it's included by splash.rc.
-# (this dependency should really be just for firefox.exe, not other targets)
-# Note the manifest file exists in the tree, so we use the explicit filename
-# here.
-ifdef HAVE_64BIT_BUILD
-EXTRA_DEPS += firefox.exe.64.manifest
-else
-EXTRA_DEPS += firefox.exe.32.manifest
-endif
-endif
-
 PROGRAMS_DEST = $(DIST)/bin
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),WINNT)
+# Rebuild a .res file if the manifest changes - it's included by splash.rc.
+# (this dependency should really be just for the .res file, not other targets)
+# Note the manifest file exists in the tree, so we use the explicit filename
+# here.
+ifdef HAVE_64BIT_BUILD
+$(RESFILE): firefox.exe.64.manifest
+else
+$(RESFILE): firefox.exe.32.manifest
+endif
+endif
+
 ifneq (,$(filter-out WINNT,$(OS_ARCH)))
 
 ifdef COMPILE_ENVIRONMENT

ipc/app/Makefile.in

@@ -26,9 +26,9 @@ ifeq ($(OS_ARCH),WINNT) #{
 # Note the manifest file exists in the tree, so we use the explicit filename
 # here.
 ifdef HAVE_64BIT_BUILD
-EXTRA_DEPS += plugin-container.exe.64.manifest
+$(RESFILE): plugin-container.exe.64.manifest
 else
-EXTRA_DEPS += plugin-container.exe.32.manifest
+$(RESFILE): plugin-container.exe.32.manifest
 endif
 endif #}