diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-02-09 19:20:52 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-02-09 19:20:52 -0800 |
| commit | 5ac75e8f4b724c2f3e7bd6f2e2c96fd69710ce1b (patch) | |
| tree | 0ba724daf342c50bb1c004b5f74e4baee99a8d5b | |
| parent | 988c07dff201e8c6471930a33e2a1069550784e1 (diff) | |
| download | emacs-5ac75e8f4b724c2f3e7bd6f2e2c96fd69710ce1b.tar.gz | |
* 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.
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
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 @@ +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 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. ## 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. |