diff options
| author | Eli Zaretskii | 2012-04-07 13:19:22 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-04-07 13:19:22 +0300 |
| commit | d67a9a85f5269ebf4c52ac7d3b9400919f5b890f (patch) | |
| tree | 3a76eccb3d5889f7ec46587e77cd6754a947064e /lib | |
| parent | 1dcece25987df8bd3e98ed8c936d9179bfa2f830 (diff) | |
| download | emacs-d67a9a85f5269ebf4c52ac7d3b9400919f5b890f.tar.gz emacs-d67a9a85f5269ebf4c52ac7d3b9400919f5b890f.zip | |
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 'lib')
| -rw-r--r-- | lib/makefile.w32-in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in index 3600406ac13..a2870345ad6 100644 --- a/lib/makefile.w32-in +++ b/lib/makefile.w32-in | |||
| @@ -41,12 +41,12 @@ $(BLD)/libgnu.$(A): $(GNULIBOBJS) | |||
| 41 | - $(DEL) $@ | 41 | - $(DEL) $@ |
| 42 | $(AR) $(AR_OUT)$@ $(ALL_DEPS) | 42 | $(AR) $(AR_OUT)$@ $(ALL_DEPS) |
| 43 | 43 | ||
| 44 | gnulib: stamp_BLD $(BLD)/libgnu.$(A) | 44 | gnulib: $(BLD)/libgnu.$(A) |
| 45 | 45 | ||
| 46 | # | 46 | # |
| 47 | # Build everything | 47 | # Build everything |
| 48 | # | 48 | # |
| 49 | all: stamp_BLD $(ALL) | 49 | all: $(ALL) |
| 50 | 50 | ||
| 51 | ### TAGS ### | 51 | ### TAGS ### |
| 52 | 52 | ||