[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99692: Close bug#5336.

[Glenn Morris]

------------------------------------------------------------
revno: 99692
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Sun 2010-03-28 11:55:20 -0700
message:
  Close bug#5336.
  
  * Makefile.in (SOME_MACHINE_OBJECTS): Ensure dbus stuff is always
  in the DOC file.
modified:
  src/ChangeLog
  src/Makefile.in

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-03-24 21:25:46 +0000
+++ b/src/ChangeLog     2010-03-28 18:55:20 +0000
@@ -1,3 +1,8 @@
+2010-03-28  Glenn Morris  <address@hidden>
+
+       * Makefile.in (SOME_MACHINE_OBJECTS): Ensure dbus stuff is always
+       in the DOC file.  (Bug#5336)
+
 2010-03-24  Chong Yidong  <address@hidden>
 
        * xdisp.c (pos_visible_p): Revert 2008-01-25 change (Bug#5730).

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-01-16 09:40:57 +0000
+++ b/src/Makefile.in   2010-03-28 18:55:20 +0000
@@ -579,7 +579,7 @@
    in case they are needed there.  */
 SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
   xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
-  fontset.o \
+  fontset.o dbusbind.o \
   nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \
   w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
   w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS)