Mercurial > emacs

comparison src/Makefile.in @ 108523:81b3d413542e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove some unused #define's, previously replaced by variables. * configure.in (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Do not define. * src/Makefile.in (LD_SWITCH_X_SITE): Define as a variable, not via cpp. (LIBX_BASE): Use $LD_SWITCH_X_SITE. * nt/config.nt (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Remove undefs. * msdos/sed1v2.inp: Comment.
author Glenn Morris <rgm@gnu.org>
date Wed, 12 May 2010 20:18:04 -0700
parents 0d518077d6bd
children 732a4fb5612e
comparison
equal deleted inserted replaced
108522:0d518077d6bd 108523:81b3d413542e
83 ## compiler can find on its own, you might want to add "-I/..." or 83 ## compiler can find on its own, you might want to add "-I/..." or
84 ## something similar. This is normally set by configure. 84 ## something similar. This is normally set by configure.
85 ## This is used before C_SWITCH_X_SYSTEM and may override it. 85 ## This is used before C_SWITCH_X_SYSTEM and may override it.
86 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ 86 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
87 87
88 ## Define LD_SWITCH_X_SITE to contain any special flags your loader
89 ## may need to deal with X Windows. For instance, if your X libraries
90 ## aren't in a place that your loader can find on its own, you might
91 ## want to add "-L/..." or something similar. Only used if
92 ## HAVE_X_WINDOWS.
93 ## FIXME? configure sets a value for this, but it has never been
94 ## substituted in this or any other Makefile. Cf C_SWITCH_X_SITE.
95 LD_SWITCH_X_SITE=
96
88 ## This holds any special options for linking temacs only (ie, not 97 ## This holds any special options for linking temacs only (ie, not
89 ## used by configure). Not used elsewhere because it sometimes 98 ## used by configure). Not used elsewhere because it sometimes
90 ## contains options that have to do with using Emacs's crt0, 99 ## contains options that have to do with using Emacs's crt0,
91 ## which are only good with temacs. 100 ## which are only good with temacs.
92 LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@ 101 LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@
238 #endif 247 #endif
239 248
240 /* On some machines #define register is done in config; 249 /* On some machines #define register is done in config;
241 do not let it interfere with this file. */ 250 do not let it interfere with this file. */
242 #undef register 251 #undef register
243
244 /* This macro is for switches specifically related to X Windows. */
245 #ifndef LD_SWITCH_X_SITE
246 #define LD_SWITCH_X_SITE
247 #endif
248 252
249 #ifdef NS_IMPL_GNUSTEP 253 #ifdef NS_IMPL_GNUSTEP
250 /* Pull in stuff from GNUstep-make. */ 254 /* Pull in stuff from GNUstep-make. */
251 FOUNDATION_LIB=gnu 255 FOUNDATION_LIB=gnu
252 GUI_LIB=gnu 256 GUI_LIB=gnu
294 OLDXMENU= 298 OLDXMENU=
295 LIBXMENU= 299 LIBXMENU=
296 #endif /* not HAVE_MENUS */ 300 #endif /* not HAVE_MENUS */
297 301
298 LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) 302 LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
299 LIBX_BASE=$(LIBXMENU) LD_SWITCH_X_SITE 303 LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
300 LIBX_OTHER=@LIBX_OTHER@ 304 LIBX_OTHER=@LIBX_OTHER@
301 #endif /* not HAVE_X_WINDOWS */ 305 #endif /* not HAVE_X_WINDOWS */
302 306
303 307
304 /* A macro which other sections of Makefile can redefine to munge the 308 /* A macro which other sections of Makefile can redefine to munge the