diff src/Makefile.in @ 83078:fac24544c283

Merged in changes from CVS HEAD Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-146 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-147 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-148 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-149 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-150 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-151 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-152 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-153 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-154 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-155 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-156 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-157 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-158 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-118

--- a/src/Makefile.in	Thu Mar 11 02:31:12 2004 +0000
+++ b/src/Makefile.in	Tue Mar 16 20:27:22 2004 +0000
@@ -305,14 +305,17 @@
 #endif
 
 #ifdef HAVE_X_WINDOWS
+
+XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o
+
 #ifdef HAVE_MENUS
 
-/* Include xmenu.o in the list of X object files.  */
+#ifndef HAVE_CARBON
+XMENU_OBJ = xmenu.o
+#endif
 
 #ifdef USE_GTK
-XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o gtkutil.o fringe.o
-#else
-XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o
+GTK_OBJ= gtkutil.o
 #endif
 
 /* The X Menu stuff is present in the X10 distribution, but missing
@@ -332,9 +335,7 @@
 
 #else /* not HAVE_MENUS */
 
-/* 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
+/* Otherwise, don't worry about the menu library at all.  */
 LIBXMENU=
 #endif /* not HAVE_MENUS */
 
@@ -447,6 +448,10 @@
 #else /* not HAVE_X11 */
 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
 #endif /* not HAVE_X11 */
+#else /* not HAVE_X_WINDOWS */
+#if defined(HAVE_MENUS) && !defined(HAVE_CARBON)
+XMENU_OBJ = xmenu.o
+#endif
 #endif /* not HAVE_X_WINDOWS */
 
 LIBSOUND= @LIBSOUND@
@@ -561,19 +566,16 @@
 
 #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
-XMENU_OBJ = xmenu.o
 #endif
 
 /* lastfile must follow all files
    whose initialized data areas should be dumped as pure by dump-emacs.  */
 obj=    dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \
 	charset.o coding.o category.o ccl.o \
-	cm.o term.o xfaces.o $(XOBJ) \
+	cm.o term.o xfaces.o $(XOBJ) $(GTK_OBJ)\
 	emacs.o keyboard.o macros.o keymap.o sysdep.o \
 	buffer.o filelock.o insdel.o marker.o \
 	minibuf.o fileio.o dired.o filemode.o \
@@ -1081,6 +1083,8 @@
 fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h charset.h frame.h \
    keyboard.h termhooks.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