Mercurial > emacs

comparison src/Makefile.in @ 108019:b235d39e4457

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
108018:a60efd79d8af 108019:b235d39e4457
80 80
81 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ 81 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
82 82
83 DBUS_CFLAGS = @DBUS_CFLAGS@ 83 DBUS_CFLAGS = @DBUS_CFLAGS@
84 DBUS_LIBS = @DBUS_LIBS@ 84 DBUS_LIBS = @DBUS_LIBS@
85 DBUS_OBJ = @DBUS_OBJ@
85 86
86 GCONF_CFLAGS = @GCONF_CFLAGS@ 87 GCONF_CFLAGS = @GCONF_CFLAGS@
87 GCONF_LIBS = @GCONF_LIBS@ 88 GCONF_LIBS = @GCONF_LIBS@
89
90 GTK_OBJ=@GTK_OBJ@
91
92 LIBXSM=@LIBXSM@
93
94 XMENU_OBJ=@XMENU_OBJ@
95 XOBJ=@XOBJ@
88 96
89 LIBSOUND= @LIBSOUND@ 97 LIBSOUND= @LIBSOUND@
90 CFLAGS_SOUND= @CFLAGS_SOUND@ 98 CFLAGS_SOUND= @CFLAGS_SOUND@
91 99
92 RSVG_LIBS= @RSVG_LIBS@ 100 RSVG_LIBS= @RSVG_LIBS@
239 include @GNUSTEP_MAKEFILES@/Additional/base.make 247 include @GNUSTEP_MAKEFILES@/Additional/base.make
240 include @GNUSTEP_MAKEFILES@/Additional/gui.make 248 include @GNUSTEP_MAKEFILES@/Additional/gui.make
241 shared=no 249 shared=no
242 #endif 250 #endif
243 251
244 #ifdef HAVE_DBUS
245 DBUS_OBJ = dbusbind.o
246 #endif
247
248 /* DO NOT use -R. There is a special hack described in lastfile.c 252 /* DO NOT use -R. There is a special hack described in lastfile.c
249 which is used instead. Some initialized data areas are modified 253 which is used instead. Some initialized data areas are modified
250 at initial startup, then labeled as part of the text area when 254 at initial startup, then labeled as part of the text area when
251 Emacs is dumped for the first time, and never changed again. */ 255 Emacs is dumped for the first time, and never changed again. */
252 256
280 #ifndef LIB_X11_LIB 284 #ifndef LIB_X11_LIB
281 #define LIB_X11_LIB -lX11 285 #define LIB_X11_LIB -lX11
282 #endif 286 #endif
283 287
284 #ifdef HAVE_X_WINDOWS 288 #ifdef HAVE_X_WINDOWS
285 XMENU_OBJ = xmenu.o
286 XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o \
287 xsettings.o xgselect.o
288
289 #ifdef HAVE_MENUS 289 #ifdef HAVE_MENUS
290
291 #ifdef USE_GTK
292 GTK_OBJ= gtkutil.o
293 #endif
294 290
295 /* The X Menu stuff is present in the X10 distribution, but missing 291 /* The X Menu stuff is present in the X10 distribution, but missing
296 from X11. If we have X10, just use the installed library; 292 from X11. If we have X10, just use the installed library;
297 otherwise, use our own copy. */ 293 otherwise, use our own copy. */
298 #ifdef HAVE_X11 294 #ifdef HAVE_X11
352 LIBW=@GTK_LIBS@ 348 LIBW=@GTK_LIBS@
353 OLDXMENU= 349 OLDXMENU=
354 LIBXMENU= 350 LIBXMENU=
355 #endif /* USE_GTK */ 351 #endif /* USE_GTK */
356 352
357 #ifdef HAVE_X_SM 353 LIBXT=$(LIBW) $(LIBXSM)
358 LIBXT=$(LIBW) -lSM -lICE
359 #else
360 LIBXT=$(LIBW)
361 #endif
362 #endif /* not USE_X_TOOLKIT */ 354 #endif /* not USE_X_TOOLKIT */
363 355
364 #ifdef HAVE_X11 356 #ifdef HAVE_X11
365 /* LD_SWITCH_X_DEFAULT comes after everything else that specifies 357 /* LD_SWITCH_X_DEFAULT comes after everything else that specifies
366 options for where to find X libraries, but before those libraries. */ 358 options for where to find X libraries, but before those libraries. */