Mercurial > emacs
changeset 108152:ad916afa5bdd
src/Makefile.in minor simplification,
* src/Makefile.in (BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT): New variables.
(WINDOW_SUPPORT) [HAVE_WINDOW_SYSTEM]: Use them.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 28 Apr 2010 00:25:47 -0700 |
| parents | 582ce1d4716e |
| children | 533b15049ee7 |
| files | src/ChangeLog src/Makefile.in |
| diffstat | 2 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Apr 28 00:20:39 2010 -0700 +++ b/src/ChangeLog Wed Apr 28 00:25:47 2010 -0700 @@ -1,5 +1,8 @@ 2010-04-28 Glenn Morris <rgm@gnu.org> + * Makefile.in (BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT): New variables. + (WINDOW_SUPPORT) [HAVE_WINDOW_SYSTEM]: Use them. + * Makefile.in (CYGWIN_OBJ): Set with configure, not cpp. * Makefile.in (GPM_MOUSE_SUPPORT): New, set by configure.
--- a/src/Makefile.in Wed Apr 28 00:20:39 2010 -0700 +++ b/src/Makefile.in Wed Apr 28 00:25:47 2010 -0700 @@ -119,6 +119,13 @@ ## Not used if HAVE_MOUSE. GPM_MOUSE_SUPPORT=@GPM_MOUSE_SUPPORT@ +BASE_WINDOW_SUPPORT=${lispsource}fringe.elc ${lispsource}image.elc \ + ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ + ${lispsource}tool-bar.elc ${lispsource}mwheel.elc + +X_WINDOW_SUPPORT=${lispsource}x-dnd.elc ${lispsource}term/common-win.elc \ + ${lispsource}term/x-win.elc ${lispsource}dynamic-setting.elc + LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ INTERVALS_H = dispextern.h intervals.h composite.h @@ -469,15 +476,9 @@ #ifdef HAVE_WINDOW_SYSTEM #ifdef HAVE_X_WINDOWS -#define WINDOW_SUPPORT ${lispsource}fringe.elc ${lispsource}image.elc \ - ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ - ${lispsource}tool-bar.elc ${lispsource}mwheel.elc ${lispsource}x-dnd.elc \ - ${lispsource}term/common-win.elc ${lispsource}term/x-win.elc \ - ${lispsource}dynamic-setting.elc +#define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT) #else -#define WINDOW_SUPPORT ${lispsource}fringe.elc ${lispsource}image.elc \ - ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ - ${lispsource}tool-bar.elc ${lispsource}mwheel.elc +#define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT) #endif #else #define WINDOW_SUPPORT