diff options
| author | Eli Zaretskii <[email protected]> | 2013-03-27 10:31:16 +0200 |
|---|---|---|
| committer | Eli Zaretskii <[email protected]> | 2013-03-27 10:31:16 +0200 |
| commit | 849e8b01604f1fba278e010a18754bc4812681c6 (patch) | |
| tree | ad9bd5c22853db93dbf7e9217b14eac756c97bf3 /nt | |
| parent | c8e9d2b4ed5e3d8f8e636cd5747dbf9e7d68485e (diff) | |
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.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 7 | ||||
| -rw-r--r-- | nt/makefile.w32-in | 12 |
2 files changed, 9 insertions, 10 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 1ae819424a..6a9c35c13a 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,5 +1,12 @@ 2013-03-27 Eli Zaretskii <[email protected]> + 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 9336ddb500..655d888c0d 100644 --- 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) |