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

[Jan Djärv]

Index: emacs/src/Makefile.in
diff -c emacs/src/Makefile.in:1.248 emacs/src/Makefile.in:1.249
*** emacs/src/Makefile.in:1.248 Sun Feb 24 13:31:35 2002
--- emacs/src/Makefile.in       Sun Mar 10 11:18:42 2002
***************
*** 294,300 ****
  #ifdef HAVE_MENUS
  
  /* Include xmenu.o in the list of X object files.  */
! XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o
  
  /* The X Menu stuff is present in the X10 distribution, but missing
     from X11.  If we have X10, just use the installed library;
--- 294,300 ----
  #ifdef HAVE_MENUS
  
  /* Include xmenu.o in the list of X object files.  */
! XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o
  
  /* The X Menu stuff is present in the X10 distribution, but missing
     from X11.  If we have X10, just use the installed library;
***************
*** 315,321 ****
  
  /* Otherwise, omit xmenu.o from the list of X object files, and
     don't worry about the menu library at all.  */
! XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o
  LIBXMENU=
  #endif /* not HAVE_MENUS */
  
--- 315,321 ----
  
  /* Otherwise, omit xmenu.o from the list of X object files, and
     don't worry about the menu library at all.  */
! XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o
  LIBXMENU=
  #endif /* not HAVE_MENUS */
  
***************
*** 366,372 ****
--- 366,376 ----
  #endif /* not LIBXT_STATIC */
  
  #else /* not USE_X_TOOLKIT */
+ #ifdef HAVE_X_SM
+ LIBXT=-lSM -lICE
+ #else
  LIBXT=
+ #endif
  #endif /* not USE_X_TOOLKIT */
  
  #if HAVE_XPM
***************
*** 549,555 ****
     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
  
  
  #ifdef TERMINFO
--- 553,559 ----
     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
  
  
  #ifdef TERMINFO
***************
*** 1128,1133 ****
--- 1132,1138 ----
  xselect.o: xselect.c dispextern.h frame.h xterm.h blockinput.h charset.h \
    coding.h ccl.h buffer.h atimer.h systime.h $(config_h)
  xrdb.o: xrdb.c $(config_h) epaths.h
+ xsmfns.o: xsmfns.c $(config_h) systime.h sysselect.h lisp.h termhooks.h
  hftctl.o: hftctl.c $(config_h)
  sound.o: sound.c dispextern.h $(config_h)
  atimer.o: atimer.c atimer.h systime.h $(config_h)