aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2011-02-09 19:20:52 -0800
committerGlenn Morris2011-02-09 19:20:52 -0800
commit5ac75e8f4b724c2f3e7bd6f2e2c96fd69710ce1b (patch)
tree0ba724daf342c50bb1c004b5f74e4baee99a8d5b /src
parent988c07dff201e8c6471930a33e2a1069550784e1 (diff)
downloademacs-5ac75e8f4b724c2f3e7bd6f2e2c96fd69710ce1b.tar.gz
emacs-5ac75e8f4b724c2f3e7bd6f2e2c96fd69710ce1b.zip
* src/Makefile.in (really-lwlib): Depend on globals.h, for parallel builds.
Otherwise, lwlib/ and src/ would try to run make-docfile at the same time, and one of them would lose when its output file disappeared.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog8
-rw-r--r--src/Makefile.in2
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5cbcd35b5c7..68a12d4f55a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,11 @@
12011-02-10 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (really-lwlib): Depend on globals.h, for parallel builds.
4
12011-02-09 Eli Zaretskii <eliz@gnu.org> 52011-02-09 Eli Zaretskii <eliz@gnu.org>
2 6
3 * makefile.w32-in (GLOBAL_SOURCES, SOME_MACHINE_OBJECTS, obj): New 7 * makefile.w32-in (GLOBAL_SOURCES, SOME_MACHINE_OBJECTS, obj):
4 macros. 8 New macros.
5 (globals.h, gl-stamp): New targets. 9 (globals.h, gl-stamp): New targets.
6 (clean): Clean gl-stamp and globals.h. 10 (clean): Clean gl-stamp and globals.h.
7 11
diff --git a/src/Makefile.in b/src/Makefile.in
index 4de8556a997..fda65be7084 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -669,7 +669,7 @@ temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) $(lib)/libgnu.
669## The following oldxmenu-related rules are only (possibly) used if 669## The following oldxmenu-related rules are only (possibly) used if
670## HAVE_X11 && !USE_GTK, but there is no harm in always defining them 670## HAVE_X11 && !USE_GTK, but there is no harm in always defining them
671## (provided we take a little care that OLDXMENU is never empty). 671## (provided we take a little care that OLDXMENU is never empty).
672really-lwlib: 672really-lwlib: globals.h
673 cd $(lwlibdir); $(MAKE) $(MFLAGS) \ 673 cd $(lwlibdir); $(MAKE) $(MFLAGS) \
674 CC='$(CC)' CFLAGS='$(CFLAGS)' MAKE='$(MAKE)' 674 CC='$(CC)' CFLAGS='$(CFLAGS)' MAKE='$(MAKE)'
675 @true # make -t should not create really-lwlib. 675 @true # make -t should not create really-lwlib.