[Emacs-diffs] /srv/bzr/emacs/trunk r112152: Fix rules in nt/makefile.w32-in for parallel builds on MS-Windows.

[Eli Zaretskii]

------------------------------------------------------------
revno: 112152
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2013-03-27 10:31:16 +0200
message:
  Fix rules in nt/makefile.w32-in for parallel builds on MS-Windows.
  
   nt/makefile.w32-in (ALL): Depend on *.exe files, not on phony names
   without the .exe suffix.
   (addpm, ddeclient, cmdproxy, addsection, preprep): Remove phony
   targets.
   (.PHONY): Remove.
modified:
  nt/ChangeLog
  nt/makefile.w32-in

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2013-03-27 07:21:43 +0000
+++ b/nt/ChangeLog      2013-03-27 08:31:16 +0000
@@ -1,5 +1,12 @@
 2013-03-27  Eli Zaretskii  <address@hidden>
 
+       Fix rules for parallel builds.
+       * makefile.w32-in (ALL): Depend on *.exe files, not on phony names
+       without the .exe suffix.
+       (addpm, ddeclient, cmdproxy, addsection, preprep): Remove phony
+       targets.
+       (.PHONY): Remove.
+
        * addpm.c (_WIN32_IE) [_W64]: Move after inclusion of standard
        headers, since that's where _W64 is declared by MinGW64.
 

=== modified file 'nt/makefile.w32-in'
--- a/nt/makefile.w32-in        2013-03-05 03:59:35 +0000
+++ b/nt/makefile.w32-in        2013-03-27 08:31:16 +0000
@@ -31,33 +31,26 @@
 
 XMFLAGS                =
 
-ALL            = addpm ddeclient runemacs cmdproxy addsection preprep
-
-.PHONY: $(ALL)
-
-
-addpm:           stamp_BLD $(BLD)/addpm.exe
+ALL            = $(BLD)/addpm.exe $(BLD)/ddeclient.exe $(BLD)/runemacs.exe \
+                 $(BLD)/cmdproxy.exe $(BLD)/addsection.exe $(BLD)/preprep.exe
+
 $(BLD)/addpm.exe: $(BLD)/addpm.$(O)
                  $(LINK) $(LINK_OUT)$@ \
                  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) \
                  $(USER32) $(OLE32) $(UUID) $(SHELL32)
 
-ddeclient:       stamp_BLD $(BLD)/ddeclient.exe
 $(BLD)/ddeclient.exe: $(BLD)/ddeclient.$(O)
                  $(LINK) $(LINK_OUT)$@ \
                  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)
 
-cmdproxy:        stamp_BLD $(BLD)/cmdproxy.exe
 $(BLD)/cmdproxy.exe: $(BLD)/cmdproxy.$(O)
                  $(LINK) $(LINK_OUT)$@ \
                  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32)
 
-addsection:      stamp_BLD $(BLD)/addsection.exe
 $(BLD)/addsection.exe: $(BLD)/addsection.$(O)
                  $(LINK) $(LINK_OUT)$@ \
                  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32)
 
-preprep:         stamp_BLD $(BLD)/preprep.exe
 $(BLD)/preprep.exe: $(BLD)/preprep.$(O)
                  $(LINK) $(LINK_OUT)$@ \
                  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS)
@@ -72,7 +65,6 @@
 $(CLIENTRES):  emacsclient.rc stamp_BLD
                $(RC) $(RC_OUT)$(CLIENTRES) emacsclient.rc
 
-runemacs:        stamp_BLD $(BLD)/runemacs.exe
 $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)
                  $(LINK) $(LINK_OUT)$@ $(SUBSYSTEM_WINDOWS) \
                  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)