Image consolidation:

(XOBJ, MAC_OBJ): Add image.o.
(image.o): Add dependencies.

diff --git a/src/Makefile.in b/src/Makefile.in
index ecf59f87b5934fc1681253586ddf511bdc450d08..5eebc10fb6dcf6209e734cfbdda8ac1103ffab96 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -334,7 +334,7 @@ LIBXMENU= -lXMenu
 
 /* 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 @@ MSDOS_OBJ = dosfns.o msdos.o w16select.o
 #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 @@ fringe.o: fringe.c dispextern.h frame.h window.h buffer.h $(config_h)
 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