Mercurial > emacs
changeset 108537:f9f040b85798
Unify some conditionals in src/Makefile.in.
* src/Makefile.in (FONT_DRIVERS): Place with other HAVE_X_WINDOWS stuff.
(TOOLTIP_SUPPORT): Place with other HAVE_WINDOW_SYSTEM stuff.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 13 May 2010 00:57:28 -0700 |
| parents | fcc84f208070 |
| children | 20b6e2c2c069 |
| files | src/ChangeLog src/Makefile.in |
| diffstat | 2 files changed, 9 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu May 13 00:41:37 2010 -0700 +++ b/src/ChangeLog Thu May 13 00:57:28 2010 -0700 @@ -1,5 +1,8 @@ 2010-05-13 Glenn Morris <rgm@gnu.org> + * Makefile.in (FONT_DRIVERS): Place with other HAVE_X_WINDOWS stuff. + (TOOLTIP_SUPPORT): Place with other HAVE_WINDOW_SYSTEM stuff. + * Makefile.in (FONT_DRIVERS): If HAVE_X_WINDOWS is defined, HAVE_WINDOW_SYSTEM must be too.
--- a/src/Makefile.in Thu May 13 00:41:37 2010 -0700 +++ b/src/Makefile.in Thu May 13 00:57:28 2010 -0700 @@ -189,7 +189,7 @@ GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@ GNUSTEP_SYSTEM_LIBRARIES=@GNUSTEP_SYSTEM_LIBRARIES@ -## Only used if HAVE_X_WINDOWS and HAVE_WINDOW_SYSTEM. +## Only used if HAVE_X_WINDOWS. FONT_OBJ=@FONT_OBJ@ ## ${lispsource}mouse.elc if HAVE_GPM, otherwise empty. @@ -294,6 +294,7 @@ LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) LIBX_OTHER=@LIBX_OTHER@ +FONT_DRIVERS=$(FONT_OBJ) #endif /* HAVE_X_WINDOWS */ @@ -353,10 +354,6 @@ ns_appsrc=@ns_appsrc@ #endif /* HAVE_NS */ -#ifdef HAVE_X_WINDOWS -FONT_DRIVERS=$(FONT_OBJ) -#endif /* HAVE_X_WINDOWS */ - /* lastfile must follow all files whose initialized data areas should be dumped as pure by dump-emacs. */ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ @@ -425,20 +422,16 @@ #endif #ifdef HAVE_WINDOW_SYSTEM +#define TOOLTIP_SUPPORT ${lispsource}tooltip.elc #ifdef HAVE_X_WINDOWS #define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT) #else #define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT) -#endif -#else -#define WINDOW_SUPPORT -#endif - -#ifdef HAVE_WINDOW_SYSTEM -#define TOOLTIP_SUPPORT ${lispsource}tooltip.elc +#endif /* HAVE_X_WINDOWS */ #else #define TOOLTIP_SUPPORT -#endif +#define WINDOW_SUPPORT +#endif /* HAVE_WINDOW_SYSTEM */ /* This is the platform-specific list of Lisp files loaded into the dumped Emacs. It is arranged like this because it is easier to generate