From: Glenn Morris <rgm@gnu.org>
Date: Sun, 28 Mar 2010 18:55:20 +0000 (-0700)
Subject: Close bug#5336.
X-Git-Tag: emacs-pretest-23.1.95~23
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=25c72475f4519a3e0566996b1407ce63e4d87b8c;p=emacs.git

Close bug#5336.

* Makefile.in (SOME_MACHINE_OBJECTS): Ensure dbus stuff is always
in the DOC file.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 3f22b7eaea9..5c9c19bbcb1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-28  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (SOME_MACHINE_OBJECTS): Ensure dbus stuff is always
+	in the DOC file.  (Bug#5336)
+
 2010-03-24  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xdisp.c (pos_visible_p): Revert 2008-01-25 change (Bug#5730).
diff --git a/src/Makefile.in b/src/Makefile.in
index 11facec6023..9caa01d9066 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -579,7 +579,7 @@ obj=    dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
    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)