* 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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5cbcd35b5c7d9b38c85c4cae592da9f7c5e52e05..68a12d4f55acf6e8ec139c5111351b4cd321ac73 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,11 @@
+2011-02-10  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (really-lwlib): Depend on globals.h, for parallel builds.
+
 2011-02-09  Eli Zaretskii  <eliz@gnu.org>
 
-       * makefile.w32-in (GLOBAL_SOURCES, SOME_MACHINE_OBJECTS, obj): New
-       macros.
+       * makefile.w32-in (GLOBAL_SOURCES, SOME_MACHINE_OBJECTS, obj):
+       New macros.
        (globals.h, gl-stamp): New targets.
        (clean): Clean gl-stamp and globals.h.
 

diff --git a/src/Makefile.in b/src/Makefile.in
index 4de8556a997002640d9d7f4af83674ef244d57b3..fda65be708439beae134426f47f77b3dde04d963 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -669,7 +669,7 @@ temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) $(lib)/libgnu.
 ## The following oldxmenu-related rules are only (possibly) used if
 ## HAVE_X11 && !USE_GTK, but there is no harm in always defining them
 ## (provided we take a little care that OLDXMENU is never empty).
-really-lwlib:
+really-lwlib: globals.h
        cd $(lwlibdir); $(MAKE) $(MFLAGS) \
     CC='$(CC)' CFLAGS='$(CFLAGS)' MAKE='$(MAKE)'
        @true  # make -t should not create really-lwlib.