# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1078964965 0
# Node ID 2f2226cb24b3afe82db7f3cb3ef3c3ea792748a9
# Parent  02a264d3657d670271ff7ee561b010f43f91069b
Image consolidation:
(XOBJ, MAC_OBJ): Add image.o.
(image.o): Add dependencies.

diff -r 02a264d3657d -r 2f2226cb24b3 src/Makefile.in
--- a/src/Makefile.in	Thu Mar 11 00:29:12 2004 +0000
+++ b/src/Makefile.in	Thu Mar 11 00:29:25 2004 +0000
@@ -334,7 +334,7 @@
 
 /* Otherwise, omit xmenu.o from the list of X object files, and
    don't worry about the menu library at all.  */
-XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o
+XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o
 LIBXMENU=
 #endif /* not HAVE_MENUS */
 
@@ -562,7 +562,7 @@
 #ifdef HAVE_CARBON
 mac = $(dot)$(dot)/mac/
 XMENU_OBJ =
-MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o fringe.o
+MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o fringe.o image.o
 emacsapp = $(PWD)/$(mac)Emacs.app/
 emacsappsrc = ${srcdir}/../mac/Emacs.app/
 #else
@@ -1079,6 +1079,8 @@
 fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h charset.h frame.h \
    keyboard.h $(config_h)
 getloadavg.o: getloadavg.c $(config_h)
+image.o: image.c frame.h window.h dispextern.h blockinput.h atimer.h \
+   systime.h xterm.h w32term.h w32gui.h macterm.h macgui.h $(config_h)
 indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \
    termopts.h disptab.h region-cache.h charset.h composite.h dispextern.h \
    keyboard.h