Mercurial > emacs
diff src/Makefile.in @ 108019:b235d39e4457
Remove some more cpp in favor of autoconf.
* configure.in (LIBSELINUX_LIBS): Always substitute in Makefiles.
(GTK_OBJ, DBUS_OBJ, LIBXSM, XMENU_OBJ, XOBJ): New output variables.
* src/Makefile.in (DBUS_OBJ, GTK_OBJ, XMENU_OBJ, XOBJ):
Define using autoconf, not cpp.
(LIBXSM): New variable, set by autoconf.
(LIBXT): Use $LIBXSM.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Tue, 20 Apr 2010 23:35:35 -0700 |
parents | c85d877f94f1 |
children | 4d8277a44bb4 |
line wrap: on
line diff
--- a/src/Makefile.in Tue Apr 20 22:47:56 2010 -0700 +++ b/src/Makefile.in Tue Apr 20 23:35:35 2010 -0700 @@ -82,10 +82,18 @@ DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_LIBS = @DBUS_LIBS@ +DBUS_OBJ = @DBUS_OBJ@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_LIBS = @GCONF_LIBS@ +GTK_OBJ=@GTK_OBJ@ + +LIBXSM=@LIBXSM@ + +XMENU_OBJ=@XMENU_OBJ@ +XOBJ=@XOBJ@ + LIBSOUND= @LIBSOUND@ CFLAGS_SOUND= @CFLAGS_SOUND@ @@ -241,10 +249,6 @@ shared=no #endif -#ifdef HAVE_DBUS -DBUS_OBJ = dbusbind.o -#endif - /* DO NOT use -R. There is a special hack described in lastfile.c which is used instead. Some initialized data areas are modified at initial startup, then labeled as part of the text area when @@ -282,16 +286,8 @@ #endif #ifdef HAVE_X_WINDOWS -XMENU_OBJ = xmenu.o -XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o \ - xsettings.o xgselect.o - #ifdef HAVE_MENUS -#ifdef USE_GTK -GTK_OBJ= gtkutil.o -#endif - /* The X Menu stuff is present in the X10 distribution, but missing from X11. If we have X10, just use the installed library; otherwise, use our own copy. */ @@ -354,11 +350,7 @@ LIBXMENU= #endif /* USE_GTK */ -#ifdef HAVE_X_SM -LIBXT=$(LIBW) -lSM -lICE -#else -LIBXT=$(LIBW) -#endif +LIBXT=$(LIBW) $(LIBXSM) #endif /* not USE_X_TOOLKIT */ #ifdef HAVE_X11