Commit 849e8b01 authored by Eli Zaretskii's avatar Eli Zaretskii

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.
parent c8e9d2b4
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.
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment