aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2013-03-27 10:31:16 +0200
committerEli Zaretskii2013-03-27 10:31:16 +0200
commit849e8b01604f1fba278e010a18754bc4812681c6 (patch)
treead9bd5c22853db93dbf7e9217b14eac756c97bf3
parentc8e9d2b4ed5e3d8f8e636cd5747dbf9e7d68485e (diff)
downloademacs-849e8b01604f1fba278e010a18754bc4812681c6.tar.gz
emacs-849e8b01604f1fba278e010a18754bc4812681c6.zip
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.
-rw-r--r--nt/ChangeLog7
-rw-r--r--nt/makefile.w32-in12
2 files changed, 9 insertions, 10 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 1ae819424af..6a9c35c13ae 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,5 +1,12 @@
12013-03-27 Eli Zaretskii <eliz@gnu.org> 12013-03-27 Eli Zaretskii <eliz@gnu.org>
2 2
3 Fix rules for parallel builds.
4 * makefile.w32-in (ALL): Depend on *.exe files, not on phony names
5 without the .exe suffix.
6 (addpm, ddeclient, cmdproxy, addsection, preprep): Remove phony
7 targets.
8 (.PHONY): Remove.
9
3 * addpm.c (_WIN32_IE) [_W64]: Move after inclusion of standard 10 * addpm.c (_WIN32_IE) [_W64]: Move after inclusion of standard
4 headers, since that's where _W64 is declared by MinGW64. 11 headers, since that's where _W64 is declared by MinGW64.
5 12
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 9336ddb5002..655d888c0d1 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -31,33 +31,26 @@ CLIENTRES = $(BLD)/emacsclient.res
31 31
32XMFLAGS = 32XMFLAGS =
33 33
34ALL = addpm ddeclient runemacs cmdproxy addsection preprep 34ALL = $(BLD)/addpm.exe $(BLD)/ddeclient.exe $(BLD)/runemacs.exe \
35 $(BLD)/cmdproxy.exe $(BLD)/addsection.exe $(BLD)/preprep.exe
35 36
36.PHONY: $(ALL)
37
38
39addpm: stamp_BLD $(BLD)/addpm.exe
40$(BLD)/addpm.exe: $(BLD)/addpm.$(O) 37$(BLD)/addpm.exe: $(BLD)/addpm.$(O)
41 $(LINK) $(LINK_OUT)$@ \ 38 $(LINK) $(LINK_OUT)$@ \
42 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) \ 39 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) \
43 $(USER32) $(OLE32) $(UUID) $(SHELL32) 40 $(USER32) $(OLE32) $(UUID) $(SHELL32)
44 41
45ddeclient: stamp_BLD $(BLD)/ddeclient.exe
46$(BLD)/ddeclient.exe: $(BLD)/ddeclient.$(O) 42$(BLD)/ddeclient.exe: $(BLD)/ddeclient.$(O)
47 $(LINK) $(LINK_OUT)$@ \ 43 $(LINK) $(LINK_OUT)$@ \
48 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32) 44 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)
49 45
50cmdproxy: stamp_BLD $(BLD)/cmdproxy.exe
51$(BLD)/cmdproxy.exe: $(BLD)/cmdproxy.$(O) 46$(BLD)/cmdproxy.exe: $(BLD)/cmdproxy.$(O)
52 $(LINK) $(LINK_OUT)$@ \ 47 $(LINK) $(LINK_OUT)$@ \
53 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32) 48 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32)
54 49
55addsection: stamp_BLD $(BLD)/addsection.exe
56$(BLD)/addsection.exe: $(BLD)/addsection.$(O) 50$(BLD)/addsection.exe: $(BLD)/addsection.$(O)
57 $(LINK) $(LINK_OUT)$@ \ 51 $(LINK) $(LINK_OUT)$@ \
58 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32) 52 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32)
59 53
60preprep: stamp_BLD $(BLD)/preprep.exe
61$(BLD)/preprep.exe: $(BLD)/preprep.$(O) 54$(BLD)/preprep.exe: $(BLD)/preprep.$(O)
62 $(LINK) $(LINK_OUT)$@ \ 55 $(LINK) $(LINK_OUT)$@ \
63 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) 56 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS)
@@ -72,7 +65,6 @@ $(TRES): emacs.rc icons/emacs.ico $(EMACS_MANIFEST) stamp_BLD
72$(CLIENTRES): emacsclient.rc stamp_BLD 65$(CLIENTRES): emacsclient.rc stamp_BLD
73 $(RC) $(RC_OUT)$(CLIENTRES) emacsclient.rc 66 $(RC) $(RC_OUT)$(CLIENTRES) emacsclient.rc
74 67
75runemacs: stamp_BLD $(BLD)/runemacs.exe
76$(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES) 68$(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)
77 $(LINK) $(LINK_OUT)$@ $(SUBSYSTEM_WINDOWS) \ 69 $(LINK) $(LINK_OUT)$@ $(SUBSYSTEM_WINDOWS) \
78 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32) 70 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)