[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/Makefile.in
From: |
Richard M . Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/src/Makefile.in |
Date: |
Thu, 15 Sep 2005 09:13:55 -0400 |
Index: emacs/src/Makefile.in
diff -c emacs/src/Makefile.in:1.313 emacs/src/Makefile.in:1.314
*** emacs/src/Makefile.in:1.313 Sun Aug 7 12:33:16 2005
--- emacs/src/Makefile.in Thu Sep 15 13:13:54 2005
***************
*** 310,319 ****
#ifdef HAVE_MENUS
- #ifndef HAVE_CARBON
- XMENU_OBJ = xmenu.o
- #endif
-
#ifdef USE_GTK
GTK_OBJ= gtkutil.o
#endif
--- 310,315 ----
***************
*** 449,457 ****
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@
--- 445,450 ----
***************
*** 577,583 ****
/* 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) $(GTK_OBJ)\
emacs.o keyboard.o macros.o keymap.o sysdep.o \
--- 570,576 ----
/* 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 \
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 \
***************
*** 596,602 ****
These go in the DOC file on all machines
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 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
--- 589,595 ----
These go in the DOC file on all machines
in case they are needed there. */
SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o \
! xterm.o xfns.o xselect.o xrdb.o xsmfns.o fringe.o image.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
- [Emacs-diffs] Changes to emacs/src/Makefile.in,
Richard M . Stallman <=