# Makefile for GNU Emacs.
-# Copyright (C) 1985, 87, 88, 93, 94, 95, 99, 2000, 01, 03, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
#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
#ifdef HAVE_MENUS
-#ifndef HAVE_CARBON
-XMENU_OBJ = xmenu.o
-#endif
-
#ifdef USE_GTK
GTK_OBJ= gtkutil.o
#endif
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@