comparison src/Makefile.in @ 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 8a2a7a0c2a8f
comparison
equal deleted inserted replaced
108151:582ce1d4716e 108152:ad916afa5bdd
117 117
118 ## ${lispsource}mouse.elc if HAVE_GPM, otherwise empty. 118 ## ${lispsource}mouse.elc if HAVE_GPM, otherwise empty.
119 ## Not used if HAVE_MOUSE. 119 ## Not used if HAVE_MOUSE.
120 GPM_MOUSE_SUPPORT=@GPM_MOUSE_SUPPORT@ 120 GPM_MOUSE_SUPPORT=@GPM_MOUSE_SUPPORT@
121 121
122 BASE_WINDOW_SUPPORT=${lispsource}fringe.elc ${lispsource}image.elc \
123 ${lispsource}international/fontset.elc ${lispsource}dnd.elc \
124 ${lispsource}tool-bar.elc ${lispsource}mwheel.elc
125
126 X_WINDOW_SUPPORT=${lispsource}x-dnd.elc ${lispsource}term/common-win.elc \
127 ${lispsource}term/x-win.elc ${lispsource}dynamic-setting.elc
128
122 LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ 129 LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
123 130
124 INTERVALS_H = dispextern.h intervals.h composite.h 131 INTERVALS_H = dispextern.h intervals.h composite.h
125 132
126 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ 133 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
467 #define MSDOS_SUPPORT 474 #define MSDOS_SUPPORT
468 #endif 475 #endif
469 476
470 #ifdef HAVE_WINDOW_SYSTEM 477 #ifdef HAVE_WINDOW_SYSTEM
471 #ifdef HAVE_X_WINDOWS 478 #ifdef HAVE_X_WINDOWS
472 #define WINDOW_SUPPORT ${lispsource}fringe.elc ${lispsource}image.elc \ 479 #define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT)
473 ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ 480 #else
474 ${lispsource}tool-bar.elc ${lispsource}mwheel.elc ${lispsource}x-dnd.elc \ 481 #define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT)
475 ${lispsource}term/common-win.elc ${lispsource}term/x-win.elc \
476 ${lispsource}dynamic-setting.elc
477 #else
478 #define WINDOW_SUPPORT ${lispsource}fringe.elc ${lispsource}image.elc \
479 ${lispsource}international/fontset.elc ${lispsource}dnd.elc \
480 ${lispsource}tool-bar.elc ${lispsource}mwheel.elc
481 #endif 482 #endif
482 #else 483 #else
483 #define WINDOW_SUPPORT 484 #define WINDOW_SUPPORT
484 #endif 485 #endif
485 486