diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-04-07 13:19:22 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-04-07 13:19:22 +0300 |
| commit | d67a9a85f5269ebf4c52ac7d3b9400919f5b890f (patch) | |
| tree | 3a76eccb3d5889f7ec46587e77cd6754a947064e /nt | |
| parent | 1dcece25987df8bd3e98ed8c936d9179bfa2f830 (diff) | |
| download | emacs-d67a9a85f5269ebf4c52ac7d3b9400919f5b890f.tar.gz | |
Fix parallel build and bootstrap on MS-Windows.
nt/makefile.w32-in: (all): Don't depend on stamp_BLD and on maybe-bootstrap.
(all-other-dirs-$(MAKETYPE)): Depend on maybe-bootstrap.
(bootstrap-gmake): Invoke the "clean" and build targets in 2
separate commands, so they run in that order even under "make -j".
lib/makefile.w32-in (gnulib, all): Don't depend on stamp_BLD.
lib-src/makefile.w32-in (ALL): Now the list of executables, not of phony
targets.
(.PHONY): Only make-docfile is its prerequisite now.
(make-docfile): Don't depend on stamp_BLD. Add a comment about
the need in this target.
(ctags, etags, ebrowse, hexl, movemail, emacsclient)
(test-distrib): Phony targets removed.
($(BLD)/test-distrib.exe): Run test-distrib as part of the recipe.
(all): Don't depend on stamp_BLD.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/makefile.w32-in | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index cecf6ac3aca..136be32ea0c 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,6 +1,10 @@ 2012-04-07 Eli Zaretskii <eliz@gnu.org> * makefile.w32-in: Convert to Unix EOL format. + (all): Don't depend on stamp_BLD and on maybe-bootstrap. + (all-other-dirs-$(MAKETYPE)): Depend on maybe-bootstrap. + (bootstrap-gmake): Invoke the "clean" and build targets in 2 + separate commands, so they run in that order even under "make -j". 2012-03-29 Eli Zaretskii <eliz@gnu.org> diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index e37a4603291..48f4e299fc6 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -89,7 +89,9 @@ $(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O # # Build emacs # -all: which-sh stamp_BLD $(ALL) $(CLIENTRES) maybe-bootstrap all-other-dirs-$(MAKETYPE) +all: which-sh $(ALL) $(CLIENTRES) all-other-dirs-$(MAKETYPE) + +all-other-dirs-$(MAKETYPE): maybe-bootstrap all-other-dirs-nmake: addsection cd ..\lib @@ -177,8 +179,10 @@ bootstrap-nmake: addsection cmdproxy bootstrap-gmake: addsection cmdproxy $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean make-docfile - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean all + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src make-docfile + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib all $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean $(CP) $(BLD)/cmdproxy.exe ../bin |