[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/makefile.w32-in,v
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/src/makefile.w32-in,v |
Date: |
Fri, 22 Dec 2006 19:21:50 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Eli Zaretskii <eliz> 06/12/22 19:21:50
Index: makefile.w32-in
===================================================================
RCS file: /cvsroot/emacs/emacs/src/makefile.w32-in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- makefile.w32-in 24 Sep 2006 12:37:45 -0000 1.41
+++ makefile.w32-in 22 Dec 2006 19:21:50 -0000 1.42
@@ -156,7 +156,7 @@
#
# The dumped executable
#
-emacs: $(BLD) $(EMACS)
+emacs: stamp_BLD $(EMACS)
$(EMACS): $(DOC) $(TEMACS)
"$(THISDIR)/$(BLD)/temacs.exe" -batch -l loadup dump
-"$(THISDIR)/$(BLD)/emacs.exe" -q -batch -f list-load-path-shadows
@@ -167,7 +167,7 @@
# If preload runs out of memory, increase the last argument to addsection
# (it is the preload heap size in MB).
#
-temacs: $(BLD) $(TEMACS)
+temacs: stamp_BLD $(TEMACS)
$(TEMACS): $(TLIB0) $(TLIB1) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES) \
../nt/$(BLD)/addsection.exe
$(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES)
$(LIBS)
@@ -185,7 +185,7 @@
# WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
# this can break with GNU Make 3.81 and later if sh.exe is used.
bootstrap-temacs:
- $(MAKE) $(MFLAGS) temacs CFLAGS=$(ARGQUOTE)$(CFLAGS)
-DPURESIZE=5000000$(ARGQUOTE)
+ $(MAKE) $(MFLAGS) $(XMFLAGS) temacs CFLAGS=$(ARGQUOTE)$(CFLAGS)
-DPURESIZE=5000000$(ARGQUOTE)
#
# Dump an Emacs executable named bootstrap-emacs containing the
@@ -1486,3 +1486,8 @@
$(SRC)/w32bdf.h \
$(SRC)/w32gui.h \
$(SRC)/w32term.h
+
+# Each object file depends on stamp_BLD, because in parallel builds we must
+# make sure $(BLD) exists before starting compilations.
+#
+$(OBJ0) $(OBJ1) $(WIN32OBJ): stamp_BLD
- [Emacs-diffs] Changes to emacs/src/makefile.w32-in,v,
Eli Zaretskii <=
- [Emacs-diffs] Changes to emacs/src/makefile.w32-in,v, Eli Zaretskii, 2006/12/22
- [Emacs-diffs] Changes to emacs/src/makefile.w32-in,v, Eli Zaretskii, 2006/12/22
- [Emacs-diffs] Changes to emacs/src/makefile.w32-in,v, Eli Zaretskii, 2006/12/22
- [Emacs-diffs] Changes to emacs/src/makefile.w32-in,v, Eli Zaretskii, 2006/12/22