Re: CVS HEAD currently broken on OSX

[YAMAMOTO Mitsuharu]

>>>>> On Fri, 16 Sep 2005 23:47:23 +0300, Eli Zaretskii <address@hidden> said:

> Yes, please do try that.  I'd like to know whether the non-Carbon
> build works as on OSX with this patch.

Alternatively, how about this one?  It is essentially the same, but
the intention is to enhance symmetry.  I tried it with terminal-only,
X11, and Carbon builds.

                                     YAMAMOTO Mitsuharu
                                address@hidden

Index: src/Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/src/Makefile.in,v
retrieving revision 1.314
diff -c -r1.314 Makefile.in
*** src/Makefile.in     15 Sep 2005 13:13:54 -0000      1.314
--- src/Makefile.in     17 Sep 2005 00:30:54 -0000
***************
*** 563,576 ****
  
  #ifdef HAVE_CARBON
  mac = $(dot)$(dot)/mac/
! 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
  
  /* 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 \
--- 563,582 ----
  
  #ifdef HAVE_CARBON
  mac = $(dot)$(dot)/mac/
! MAC_OBJ = mac.o macterm.o macfns.o macselect.o fontset.o fringe.o image.o
  emacsapp = $(PWD)/$(mac)Emacs.app/
  emacsappsrc = ${srcdir}/../mac/Emacs.app/
  #endif
  
+ #ifndef HAVE_CARBON
+ MENU_OBJ = xmenu.o
+ #else
+ MENU_OBJ = macmenu.o
+ #endif
+ 
  /* 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 $(MENU_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 \
***************
*** 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
--- 595,601 ----
     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