(XMENU_OBJ) [!HAVE_CARBON]: Reinstate variable.

(obj): Use XMENU_OBJ, not a literal xmenu.o.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6704efa084bf9855b7f9e1ba50e0e5d299cea781..cbacb14078a79f5f922997ebcac8b83fdbd01c35 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-17  Eli Zaretskii  <eliz@gnu.org>
+
+       * Makefile.in (XMENU_OBJ) [!HAVE_CARBON]: Reinstate variable.
+       (obj): Use XMENU_OBJ, not a literal xmenu.o.
+
 2005-09-16  Romain Francoise  <romain@orebokech.com>
 
        * fileio.c (syms_of_fileio) <write-region-inhibit-fsync>: Doc fix.

diff --git a/src/Makefile.in b/src/Makefile.in
index c085473d437d476d9e012edb03f2904bb5641c13..5cc933c9734beae961c2e62d259698027b93e8e2 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -304,6 +304,11 @@ ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcd
 #define LIB_X11_LIB -lX11
 #endif
 
+/* xmenu.c should not be compiled on OSX.  */
+#ifndef HAVE_CARBON
+XMENU_OBJ = xmenu.o
+#endif
+
 #ifdef HAVE_X_WINDOWS
 
 XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o
@@ -570,7 +575,7 @@ emacsappsrc = ${srcdir}/../mac/Emacs.app/
 
 /* 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.o 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) $(GTK_OBJ)\
        emacs.o keyboard.o macros.o keymap.o sysdep.o \