[Emacs-diffs] Changes to emacs/src/Makefile.in [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/Makefile.in
diff -c emacs/src/Makefile.in:1.279.2.11 emacs/src/Makefile.in:1.279.2.12
*** emacs/src/Makefile.in:1.279.2.11    Thu Nov  4 08:55:34 2004
--- emacs/src/Makefile.in       Fri Nov 12 02:52:58 2004
***************
*** 596,603 ****
     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 \
!   mac.o macterm.o macfns.o macmenu.o fontset.o
  
  
  #ifdef TERMINFO
--- 596,605 ----
     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 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
  
  
  #ifdef TERMINFO
***************
*** 926,931 ****
--- 928,934 ----
  #endif
  
  temacs${EXEEXT}: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu 
${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT}
+       echo "${obj} ${otherobj} " OBJECTS_MACHINE > buildobj.lst
        $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
      -o temacs ${STARTFILES} ${obj} ${otherobj}  \
      OBJECTS_MACHINE ${LIBES}
***************
*** 941,947 ****
  #define OLDXMENU_OPTIONS
  #endif
  
! #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS)
  
  /* We use stamp-xmenu with these two deps
     to both ensure that lwlib gets remade based on its dependencies
--- 944,950 ----
  #define OLDXMENU_OPTIONS
  #endif
  
! #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && 
! defined (HAVE_GTK)
  
  /* We use stamp-xmenu with these two deps
     to both ensure that lwlib gets remade based on its dependencies
***************
*** 997,1008 ****
        @true  /* make -t should not create really-oldXMenu.  */
  .PHONY: really-oldXMenu
  #endif /* not USE_X_TOOLKIT */
! #else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */
  
  /* We don\'t really need this, but satisfy the dependency.  */
  stamp-oldxmenu:
        touch stamp-oldxmenu
! #endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */
  
  ../config.status:: epaths.in
        @echo "The file epaths.h needs to be set up from epaths.in."
--- 1000,1011 ----
        @true  /* make -t should not create really-oldXMenu.  */
  .PHONY: really-oldXMenu
  #endif /* not USE_X_TOOLKIT */
! #else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! HAVE_GTK) */
  
  /* We don\'t really need this, but satisfy the dependency.  */
  stamp-oldxmenu:
        touch stamp-oldxmenu
! #endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! HAVE_GTK) */
  
  ../config.status:: epaths.in
        @echo "The file epaths.h needs to be set up from epaths.in."
***************
*** 1266,1271 ****
--- 1269,1275 ----
        rm -f temacs${EXEEXT} prefix-args${EXEEXT} core *.core \#* *.o 
libXMenu11.a liblw.a
        rm -f ../etc/DOC
        rm -f bootstrap-emacs${EXEEXT}
+       rm -f buildobj.lst
  clean: mostlyclean
        rm -f emacs-*${EXEEXT} emacs${EXEEXT}
  /**/# This is used in making a distribution.