# 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.
# You should have received a copy of the GNU General Public License
# along with GNU Emacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Note that this file is edited by msdos/sed1v2.inp for MSDOS. That
#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@
#ifdef HAVE_CARBON
mac = $(dot)$(dot)/mac/
-MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o fringe.o image.o
+MAC_OBJ = mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o fringe.o image.o
emacsapp = $(PWD)/$(mac)Emacs.app/
emacsappsrc = ${srcdir}/../mac/Emacs.app/
#endif
in case they are needed there. */
SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
- mac.o macterm.o macfns.o macmenu.o fontset.o \
+ mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \
w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o
${lispsource}textmodes/paragraphs.elc \
${lispsource}textmodes/text-mode.elc \
${lispsource}emacs-lisp/timer.elc \
+ ${lispsource}jka-cmpr-hook.elc \
${lispsource}vc-hooks.elc \
${lispsource}ediff-hook.elc \
TOOLTIP_SUPPORT \
../lisp/textmodes/text-mode.elc \
../lisp/emacs-lisp/timer.elc \
../lisp/vc-hooks.elc \
+ ../lisp/jka-cmpr-hook.elc \
../lisp/ediff-hook.elc \
../lisp/widget.elc \
../lisp/window.elc \
fontset.o indent.o insdel.o keyboard.o macros.o minibuf.o msdos.o process.o \
scroll.o sysdep.o term.o widget.o window.o xdisp.o xfaces.o xfns.o xmenu.o \
xterm.o xselect.o sound.o: macgui.h
-mac.o: mac.c process.h sysselect.h blockinput.h atimer.h systime.h $(config_h)
+mac.o: mac.c process.h sysselect.h blockinput.h atimer.h systime.h charset.h \
+ coding.h ccl.h $(config_h)
macfns.o: macfns.c charset.h macterm.h macgui.h frame.h window.h buffer.h \
dispextern.h macgui.h fontset.h $(INTERVAL_SRC) keyboard.h blockinput.h \
atimer.h systime.h epaths.h termhooks.h coding.h systime.h $(config_h)
frame.h charset.h ccl.h dispextern.h fontset.h termhooks.h termopts.h \
termchar.h gnu.h disptab.h buffer.h window.h keyboard.h $(INTERVAL_SRC) \
process.h coding.h $(config_h)
+macselect.o: blockinput.h macterm.h macgui.h frame.h $(config_h)
${emacsapp}Contents/Resources/English.lproj:
mkdir -p $@