emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r103193: * src/Makefile.in ($(otherob


From: Paul Eggert
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r103193: * src/Makefile.in ($(otherobj)): Depend on globals.h.
Date: Tue, 08 Feb 2011 16:44:29 -0800
User-agent: Bazaar (2.0.3)

------------------------------------------------------------
revno: 103193
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2011-02-08 16:44:29 -0800
message:
  * src/Makefile.in ($(otherobj)): Depend on globals.h.
modified:
  src/ChangeLog
  src/Makefile.in
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-08 21:42:56 +0000
+++ b/src/ChangeLog     2011-02-09 00:44:29 +0000
@@ -1,3 +1,9 @@
+2011-02-09  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * Makefile.in (NS_OBJC_OBJ): New variable.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2011-02-08 21:42:56 +0000
+++ b/src/Makefile.in   2011-02-09 00:44:29 +0000
@@ -106,7 +106,7 @@
 
 ## 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.
 address@hidden@
 
@@ -190,7 +190,7 @@
 ## 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.
 address@hidden@
 
 ## If !HAVE_X11 && HAVE_X_WINDOWS, -lXMenu (this case no longer possible).
@@ -241,7 +241,7 @@
  $(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 =
 
 address@hidden@
 address@hidden@
@@ -657,7 +657,7 @@
        $(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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]