Mercurial > emacs
diff src/Makefile.in @ 108523:81b3d413542e
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 |
line wrap: on
line diff
--- a/src/Makefile.in Wed May 12 19:50:20 2010 -0700 +++ b/src/Makefile.in Wed May 12 20:18:04 2010 -0700 @@ -85,6 +85,15 @@ ## This is used before C_SWITCH_X_SYSTEM and may override it. C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ +## Define LD_SWITCH_X_SITE to contain any special flags your loader +## may need to deal with X Windows. For instance, if your X libraries +## aren't in a place that your loader can find on its own, you might +## want to add "-L/..." or something similar. Only used if +## HAVE_X_WINDOWS. +## FIXME? configure sets a value for this, but it has never been +## substituted in this or any other Makefile. Cf C_SWITCH_X_SITE. +LD_SWITCH_X_SITE= + ## This holds any special options for linking temacs only (ie, not ## used by configure). Not used elsewhere because it sometimes ## contains options that have to do with using Emacs's crt0, @@ -241,11 +250,6 @@ do not let it interfere with this file. */ #undef register -/* This macro is for switches specifically related to X Windows. */ -#ifndef LD_SWITCH_X_SITE -#define LD_SWITCH_X_SITE -#endif - #ifdef NS_IMPL_GNUSTEP /* Pull in stuff from GNUstep-make. */ FOUNDATION_LIB=gnu @@ -296,7 +300,7 @@ #endif /* not HAVE_MENUS */ LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) -LIBX_BASE=$(LIBXMENU) LD_SWITCH_X_SITE +LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) LIBX_OTHER=@LIBX_OTHER@ #endif /* not HAVE_X_WINDOWS */
