# HG changeset patch # User Jan Dj¸«£rv # Date 1015777122 0 # Node ID 93620959c2b1d549a22ee75f52b6b87b8540aba0 # Parent 59782f44bcb6f49fffcaa4b37a0b33fc6c9a8cc6 Added test for HAVE_X_SM and added new file xsmfns.c diff -r 59782f44bcb6 -r 93620959c2b1 src/Makefile.in --- a/src/Makefile.in Sun Mar 10 16:17:59 2002 +0000 +++ b/src/Makefile.in Sun Mar 10 16:18:42 2002 +0000 @@ -294,7 +294,7 @@ #ifdef HAVE_MENUS /* Include xmenu.o in the list of X object files. */ -XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o +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,7 +315,7 @@ /* 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 +XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o LIBXMENU= #endif /* not HAVE_MENUS */ @@ -366,7 +366,11 @@ #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,7 +553,7 @@ 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 + xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o #ifdef TERMINFO @@ -1128,6 +1132,7 @@ 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)