diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2006-12-22 18:43:11 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2006-12-22 18:43:11 +0000 |
| commit | 1a8a626d0223ac99a269a3249431df50cdde92f3 (patch) | |
| tree | 0ff8fd1b1b6ec0d45742738f61b4aa517e26c520 /lib-src | |
| parent | b47342e3bf175c9d3e3f6c3f7549836a0a58eef9 (diff) | |
| download | emacs-1a8a626d0223ac99a269a3249431df50cdde92f3.tar.gz | |
(make-docfile, ctags, etags, ebrowse, hexl)
(movemail, fakemail, sorted-doc, digest-doc, emacsclient)
(test-distrib, $(DOC), all): depend on stamp_BLD instead of $(BLD).
($(BLD)/make-docfile.$(O) $(BLD)/hexl.$(O) $(BLD)/fakemail.$(O))
($(BLD)/sorted-doc.$(O) $(BLD)/digest-doc.$(O))
($(BLD)/test-distrib.$(O) $(GETOPTOBJS) $(MOVEMAILOBJS))
($(BLD)/emacsclient.$(O) $(BLD)/etags.$(O) $(BLD)/regex.$(O))
($(BLD)/ebrowse.$(O) $(BLD)/ctags.$(O)): Depend on stamp_BLD.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/makefile.w32-in | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 2bbf6d07648..7d49748ebc5 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -45,18 +45,18 @@ $(BLD)/digest-doc.exe: $(BLD)/digest-doc.$(O) $(BLD)/test-distrib.exe: $(BLD)/test-distrib.$(O) $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/test-distrib.$(O) $(LIBS) -make-docfile: $(BLD) $(BLD)/make-docfile.exe -ctags: $(BLD) $(BLD)/ctags.exe -etags: $(BLD) $(BLD)/etags.exe -ebrowse: $(BLD) $(BLD)/ebrowse.exe -hexl: $(BLD) $(BLD)/hexl.exe -movemail: $(BLD) $(BLD)/movemail.exe -fakemail: $(BLD) $(BLD)/fakemail.exe -sorted-doc: $(BLD) $(BLD)/sorted-doc.exe -digest-doc: $(BLD) $(BLD)/digest-doc.exe -emacsclient: $(BLD) $(BLD)/emacsclient.exe $(BLD)/emacsclientw.exe - -test-distrib: $(BLD) $(BLD)/test-distrib.exe +make-docfile: stamp_BLD $(BLD)/make-docfile.exe +ctags: stamp_BLD $(BLD)/ctags.exe +etags: stamp_BLD $(BLD)/etags.exe +ebrowse: stamp_BLD $(BLD)/ebrowse.exe +hexl: stamp_BLD $(BLD)/hexl.exe +movemail: stamp_BLD $(BLD)/movemail.exe +fakemail: stamp_BLD $(BLD)/fakemail.exe +sorted-doc: stamp_BLD $(BLD)/sorted-doc.exe +digest-doc: stamp_BLD $(BLD)/digest-doc.exe +emacsclient: stamp_BLD $(BLD)/emacsclient.exe $(BLD)/emacsclientw.exe + +test-distrib: stamp_BLD $(BLD)/test-distrib.exe "$(BLD)/test-distrib.exe" "$(SRC)/testfile" GETOPTOBJS = $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O) @@ -285,7 +285,7 @@ lisp2 = \ - $(DEL) temacs.exe DOC = DOC -$(DOC): $(BLD) $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp2) +$(DOC): stamp_BLD $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp2) - $(DEL) $(DOC) "$(THISDIR)/$(BLD)/make-docfile" -o $(DOC) -d ../src $(obj) "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp1) @@ -301,7 +301,7 @@ $(DOC): $(BLD) $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp # # Build the executables # -all: $(BLD) $(ALL) $(DOC) +all: stamp_BLD $(ALL) $(DOC) # # Assuming INSTALL_DIR is defined, build and install emacs in it. @@ -482,3 +482,16 @@ $(BLD)/timer.$(O) : \ $(EMACS_ROOT)/src/s/ms-w32.h \ $(EMACS_ROOT)/src/m/intel386.h \ $(EMACS_ROOT)/lib-src/../src/config.h + +# The following dependencies are for supporting parallel builds, where +# we must make sure $(BLD) exists before any compilation starts. +# +$(BLD)/make-docfile.$(O) $(BLD)/hexl.$(O) $(BLD)/fakemail.$(O): stamp_BLD + +$(BLD)/sorted-doc.$(O) $(BLD)/digest-doc.$(O): stamp_BLD + +$(BLD)/test-distrib.$(O) $(GETOPTOBJS) $(MOVEMAILOBJS): stamp_BLD + +$(BLD)/emacsclient.$(O) $(BLD)/etags.$(O) $(BLD)/regex.$(O): stamp_BLD + +$(BLD)/ebrowse.$(O) $(BLD)/ctags.$(O): stamp_BLD |