diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-08 16:44:29 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-08 16:44:29 -0800 |
| commit | f9f2e7f5407ab70e295562652dd080b86fb88292 (patch) | |
| tree | 49b8bf7cc6109dc0d025b7cf4fadf7ba98eaf520 /src | |
| parent | 64df8c10985095b9fe15b622da41cd45de8b9261 (diff) | |
| download | emacs-f9f2e7f5407ab70e295562652dd080b86fb88292.tar.gz | |
* src/Makefile.in ($(otherobj)): Depend on globals.h.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/Makefile.in | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0a9cb607793..0caac8d3e65 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-02-09 Paul Eggert <eggert@cs.ucla.edu> + + * Makefile.in ($(otherobj)): Depend on globals.h. + Otherwise 'make -j10' failed on my host, because the build lacked + necessary dependencies, e.g., vm-limit.o depends on globals.h. + 2011-02-08 Tom Tromey <tromey@redhat.com> * Makefile.in (NS_OBJC_OBJ): New variable. diff --git a/src/Makefile.in b/src/Makefile.in index e1c663dfbb7..4007d9e8a62 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -106,7 +106,7 @@ LD_SWITCH_SYSTEM=@LD_SWITCH_SYSTEM@ ## This holds any special options for linking temacs only (ie, not ## used by configure). Not used elsewhere because it sometimes -## contains options that have to do with using Emacs's crt0, +## contains options that have to do with using Emacs's crt0, ## which are only good with temacs. LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@ @@ -190,7 +190,7 @@ OLDXMENU=@OLDXMENU@ ## If HAVE_X11 && !USE_GTK, $(OLDXMENU) ../src/$(OLDXMENU); else empty. ## We use stamp-xmenu with these two deps to both ensure that lwlib ## gets remade based on its dependencies in its own makefile, -## and remake temacs if lwlib gets changed by this. +## and remake temacs if lwlib gets changed by this. OLDXMENU_DEPS=@OLDXMENU_DEPS@ ## If !HAVE_X11 && HAVE_X_WINDOWS, -lXMenu (this case no longer possible). @@ -241,7 +241,7 @@ MSDOS_SUPPORT_REAL = $(lispsource)/ls-lisp.elc $(lispsource)/disp-table.elc \ $(lispsource)/dos-fns.elc $(lispsource)/dos-w32.elc $(lispsource)/dos-vars.elc \ $(lispsource)/term/internal.elc $(lispsource)/term/pc-win.elc ## $MSDOS_SUPPORT_REAL if MSDOS. -MSDOS_SUPPORT = +MSDOS_SUPPORT = ns_appdir=@ns_appdir@ ns_appbindir=@ns_appbindir@ @@ -657,7 +657,7 @@ gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) $(libsrc)/make-docfile -d $(srcdir) -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp $(srcdir)/../move-if-change gl-tmp gl-stamp -$(obj): globals.h +$(obj) $(otherobj): globals.h $(lib)/libgnu.a: $(config_h) cd $(lib) && $(MAKE) libgnu.a |