diff src/Makefile.in @ 83038:30ccd595ccb0

Merged in changes from CVS HEAD Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-98 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-99 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-100 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-101 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-102 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-78

--- a/src/Makefile.in	Tue Feb 17 01:52:25 2004 +0000
+++ b/src/Makefile.in	Wed Feb 18 17:10:32 2004 +0000
@@ -310,9 +310,9 @@
 /* Include xmenu.o in the list of X object files.  */
 
 #ifdef USE_GTK
-XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o gtkutil.o
+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
+XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o
 #endif
 
 /* The X Menu stuff is present in the X10 distribution, but missing
@@ -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
+XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.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
+MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o fringe.o
 emacsapp = $(PWD)/$(mac)Emacs.app/
 emacsappsrc = ${srcdir}/../mac/Emacs.app/
 #else
@@ -571,7 +571,7 @@
 
 /* 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 fringe.o $(XMENU_OBJ) window.o \
+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) \
 	emacs.o keyboard.o macros.o keymap.o sysdep.o \