/[emacs]/emacs/src/Makefile.in
ViewVC logotype

Diff of /emacs/src/Makefile.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.313 by ttn, Sun Aug 7 12:33:16 2005 UTC revision 1.314 by rms, Thu Sep 15 13:13:54 2005 UTC
# Line 310  XOBJ= xterm.o xfns.o xselect.o xrdb.o fo Line 310  XOBJ= xterm.o xfns.o xselect.o xrdb.o fo
310    
311  #ifdef HAVE_MENUS  #ifdef HAVE_MENUS
312    
 #ifndef HAVE_CARBON  
 XMENU_OBJ = xmenu.o  
 #endif  
   
313  #ifdef USE_GTK  #ifdef USE_GTK
314  GTK_OBJ= gtkutil.o  GTK_OBJ= gtkutil.o
315  #endif  #endif
# Line 449  LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT Line 445  LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT
445  LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM  LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
446  #endif /* not HAVE_X11 */  #endif /* not HAVE_X11 */
447  #else /* not HAVE_X_WINDOWS */  #else /* not HAVE_X_WINDOWS */
 #if defined(HAVE_MENUS) && !defined(HAVE_CARBON)  
 XMENU_OBJ = xmenu.o  
 #endif  
448  #endif /* not HAVE_X_WINDOWS */  #endif /* not HAVE_X_WINDOWS */
449    
450  LIBSOUND= @LIBSOUND@  LIBSOUND= @LIBSOUND@
# Line 577  emacsappsrc = ${srcdir}/../mac/Emacs.app Line 570  emacsappsrc = ${srcdir}/../mac/Emacs.app
570    
571  /* lastfile must follow all files  /* lastfile must follow all files
572     whose initialized data areas should be dumped as pure by dump-emacs.  */     whose initialized data areas should be dumped as pure by dump-emacs.  */
573  obj=    dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \  obj=    dispnew.o frame.o scroll.o xdisp.o xmenu.o window.o \
574          charset.o coding.o category.o ccl.o \          charset.o coding.o category.o ccl.o \
575          cm.o term.o xfaces.o $(XOBJ) $(GTK_OBJ)\          cm.o term.o xfaces.o $(XOBJ) $(GTK_OBJ)\
576          emacs.o keyboard.o macros.o keymap.o sysdep.o \          emacs.o keyboard.o macros.o keymap.o sysdep.o \
# Line 596  obj=    dispnew.o frame.o scroll.o xdisp Line 589  obj=    dispnew.o frame.o scroll.o xdisp
589     These go in the DOC file on all machines     These go in the DOC file on all machines
590     in case they are needed there.  */     in case they are needed there.  */
591  SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o \  SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o \
592    xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \    xterm.o xfns.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
593    mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \    mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \
594    w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \    w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \
595    w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o    w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o

Legend:
Removed from v.1.313  
changed lines
  Added in v.1.314

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26