diff options
| author | Glenn Morris | 2010-04-27 00:33:35 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-04-27 00:33:35 -0700 |
| commit | 986fb647cc1df1edeeaa2c0e7cb34c100eb9efb9 (patch) | |
| tree | ff31c46f33ca23bf6d9e1cc4e8c945a5c9198871 /src/Makefile.in | |
| parent | c6ea2936cc41ada03967fc7b89c49b012e44aceb (diff) | |
| download | emacs-986fb647cc1df1edeeaa2c0e7cb34c100eb9efb9.tar.gz emacs-986fb647cc1df1edeeaa2c0e7cb34c100eb9efb9.zip | |
Replace LUCID_LIBW, MOTIF_LIBW with TOOLKIT_LIBW.
* configure.in (LUCID_LIBW, MOTIF_LIBW): No longer substitute in Makefiles.
(TOOLKIT_LIBW): New output variable, replacing LUCID_LIBW/MOTIF_LIBW.
* src/Makefile.in (LUCID_LIBW, MOTIF_LIBW): Remove, replacing by...
(TOOLKIT_LIBW): New, set by configure.
(@X_TOOLKIT_TYPE@): No longer define it.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 5b4426686d0..9c55ebbb96b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -91,8 +91,7 @@ LIBXSM=@LIBXSM@ | |||
| 91 | XMENU_OBJ=@XMENU_OBJ@ | 91 | XMENU_OBJ=@XMENU_OBJ@ |
| 92 | XOBJ=@XOBJ@ | 92 | XOBJ=@XOBJ@ |
| 93 | 93 | ||
| 94 | LUCID_LIBW=@LUCID_LIBW@ | 94 | TOOLKIT_LIBW=@TOOLKIT_LIBW@ |
| 95 | MOTIF_LIBW=@MOTIF_LIBW@ | ||
| 96 | 95 | ||
| 97 | LIBSOUND= @LIBSOUND@ | 96 | LIBSOUND= @LIBSOUND@ |
| 98 | CFLAGS_SOUND= @CFLAGS_SOUND@ | 97 | CFLAGS_SOUND= @CFLAGS_SOUND@ |
| @@ -255,8 +254,7 @@ LIBXMENU= | |||
| 255 | #endif /* not HAVE_MENUS */ | 254 | #endif /* not HAVE_MENUS */ |
| 256 | 255 | ||
| 257 | #ifdef USE_X_TOOLKIT | 256 | #ifdef USE_X_TOOLKIT |
| 258 | # define @X_TOOLKIT_TYPE@ | 257 | LIBW=$(TOOLKIT_LIBW) |
| 259 | LIBW=$(@X_TOOLKIT_TYPE@_LIBW) | ||
| 260 | 258 | ||
| 261 | #ifdef HAVE_X11XTR6 | 259 | #ifdef HAVE_X11XTR6 |
| 262 | #ifdef NEED_LIBW | 260 | #ifdef NEED_LIBW |