(XOBJ): Consolidate into one list. Add fringe.o.

Move gtkutil.o to new GTK_OBJ list.
(XMENU_OBJ) [HAVE_MENUS]: Move declaration to proper place.
(GTK_OBJ) [USE_GTK]: New declaration.
(obj): Add $(GTK_OBJ) to list.

2 files changed, 17 insertions, 11 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index df407ca48b9..fdbabd0e0f8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-11  Kim F. Storm  <storm@cua.dk>
+
+        * Makefile.in (XOBJ): Consolidate into one list.  Add fringe.o.
+        Move gtkutil.o to new GTK_OBJ list.  
+        (XMENU_OBJ) [HAVE_MENUS]: Move declaration to proper place.
+        (GTK_OBJ) [USE_GTK]: New declaration.
+        (obj): Add $(GTK_OBJ) to list.
+
 2004-03-11  Steven Tamm <steventamm@mac.com>
         * image.c [MAC_OSX]: Include sys/stat.h
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 5eebc10fb6d..3b6f731e531 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -305,14 +305,17 @@ ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcd
 #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 @@ LIBXMENU= -lXMenu
 
 #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 image.o
+/* Otherwise, don't worry about the menu library at all.  */
 LIBXMENU=
 #endif /* not HAVE_MENUS */
 
@@ -561,19 +562,16 @@ 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 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 \