diff options
| author | Paul Eggert | 2011-02-08 16:44:29 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-02-08 16:44:29 -0800 |
| commit | f9f2e7f5407ab70e295562652dd080b86fb88292 (patch) | |
| tree | 49b8bf7cc6109dc0d025b7cf4fadf7ba98eaf520 /src | |
| parent | 64df8c10985095b9fe15b622da41cd45de8b9261 (diff) | |
| download | emacs-f9f2e7f5407ab70e295562652dd080b86fb88292.tar.gz emacs-f9f2e7f5407ab70e295562652dd080b86fb88292.zip | |
* 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 @@ | |||
| 1 | 2011-02-09 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * Makefile.in ($(otherobj)): Depend on globals.h. | ||
| 4 | Otherwise 'make -j10' failed on my host, because the build lacked | ||
| 5 | necessary dependencies, e.g., vm-limit.o depends on globals.h. | ||
| 6 | |||
| 1 | 2011-02-08 Tom Tromey <tromey@redhat.com> | 7 | 2011-02-08 Tom Tromey <tromey@redhat.com> |
| 2 | 8 | ||
| 3 | * Makefile.in (NS_OBJC_OBJ): New variable. | 9 | * 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@ | |||
| 106 | 106 | ||
| 107 | ## This holds any special options for linking temacs only (ie, not | 107 | ## This holds any special options for linking temacs only (ie, not |
| 108 | ## used by configure). Not used elsewhere because it sometimes | 108 | ## used by configure). Not used elsewhere because it sometimes |
| 109 | ## contains options that have to do with using Emacs's crt0, | 109 | ## contains options that have to do with using Emacs's crt0, |
| 110 | ## which are only good with temacs. | 110 | ## which are only good with temacs. |
| 111 | LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@ | 111 | LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@ |
| 112 | 112 | ||
| @@ -190,7 +190,7 @@ OLDXMENU=@OLDXMENU@ | |||
| 190 | ## If HAVE_X11 && !USE_GTK, $(OLDXMENU) ../src/$(OLDXMENU); else empty. | 190 | ## If HAVE_X11 && !USE_GTK, $(OLDXMENU) ../src/$(OLDXMENU); else empty. |
| 191 | ## We use stamp-xmenu with these two deps to both ensure that lwlib | 191 | ## We use stamp-xmenu with these two deps to both ensure that lwlib |
| 192 | ## gets remade based on its dependencies in its own makefile, | 192 | ## gets remade based on its dependencies in its own makefile, |
| 193 | ## and remake temacs if lwlib gets changed by this. | 193 | ## and remake temacs if lwlib gets changed by this. |
| 194 | OLDXMENU_DEPS=@OLDXMENU_DEPS@ | 194 | OLDXMENU_DEPS=@OLDXMENU_DEPS@ |
| 195 | 195 | ||
| 196 | ## If !HAVE_X11 && HAVE_X_WINDOWS, -lXMenu (this case no longer possible). | 196 | ## 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 \ | |||
| 241 | $(lispsource)/dos-fns.elc $(lispsource)/dos-w32.elc $(lispsource)/dos-vars.elc \ | 241 | $(lispsource)/dos-fns.elc $(lispsource)/dos-w32.elc $(lispsource)/dos-vars.elc \ |
| 242 | $(lispsource)/term/internal.elc $(lispsource)/term/pc-win.elc | 242 | $(lispsource)/term/internal.elc $(lispsource)/term/pc-win.elc |
| 243 | ## $MSDOS_SUPPORT_REAL if MSDOS. | 243 | ## $MSDOS_SUPPORT_REAL if MSDOS. |
| 244 | MSDOS_SUPPORT = | 244 | MSDOS_SUPPORT = |
| 245 | 245 | ||
| 246 | ns_appdir=@ns_appdir@ | 246 | ns_appdir=@ns_appdir@ |
| 247 | ns_appbindir=@ns_appbindir@ | 247 | ns_appbindir=@ns_appbindir@ |
| @@ -657,7 +657,7 @@ gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) | |||
| 657 | $(libsrc)/make-docfile -d $(srcdir) -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp | 657 | $(libsrc)/make-docfile -d $(srcdir) -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp |
| 658 | $(srcdir)/../move-if-change gl-tmp gl-stamp | 658 | $(srcdir)/../move-if-change gl-tmp gl-stamp |
| 659 | 659 | ||
| 660 | $(obj): globals.h | 660 | $(obj) $(otherobj): globals.h |
| 661 | 661 | ||
| 662 | $(lib)/libgnu.a: $(config_h) | 662 | $(lib)/libgnu.a: $(config_h) |
| 663 | cd $(lib) && $(MAKE) libgnu.a | 663 | cd $(lib) && $(MAKE) libgnu.a |