[Emacs-diffs] Changes to emacs/lib-src/makefile.w32-in,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    06/12/22 18:43:11

Index: makefile.w32-in
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/makefile.w32-in,v
retrieving revision 2.55
retrieving revision 2.56
diff -u -b -r2.55 -r2.56
--- makefile.w32-in     19 Dec 2006 19:25:57 -0000      2.55
+++ makefile.w32-in     22 Dec 2006 18:43:11 -0000      2.56
@@ -45,18 +45,18 @@
 $(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
+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:  $(BLD) $(BLD)/test-distrib.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 @@
        - $(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 @@
 #
 # 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 @@
        $(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