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.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 1ae819424afafc3ab0c3a8d6466cf759f911a3ce..6a9c35c13ae4fdd92788b91990ee13f80faf2e65 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,5 +1,12 @@
 2013-03-27  Eli Zaretskii  <eliz@gnu.org>
 
+       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.
 

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 9336ddb5002a8c33fedc9607958d0ef6518c74d1..655d888c0d1ae6d200db51d8b35cf832fc81ccdf 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -31,33 +31,26 @@ CLIENTRES   = $(BLD)/emacsclient.res
 
 XMFLAGS                =
 
-ALL            = addpm ddeclient runemacs cmdproxy addsection preprep
+ALL            = $(BLD)/addpm.exe $(BLD)/ddeclient.exe $(BLD)/runemacs.exe \
+                 $(BLD)/cmdproxy.exe $(BLD)/addsection.exe $(BLD)/preprep.exe
 
-.PHONY: $(ALL)
-
-
-addpm:           stamp_BLD $(BLD)/addpm.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 @@ $(TRES):      emacs.rc icons/emacs.ico $(EMACS_MANIFEST) stamp_BLD
 $(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)