Commit 3369c79f authored by Glenn Morris's avatar Glenn Morris
Browse files

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.
parent d5e982a6
2010-05-13 Glenn Morris <rgm@gnu.org> 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, * Makefile.in (FONT_DRIVERS): If HAVE_X_WINDOWS is defined,
HAVE_WINDOW_SYSTEM must be too. HAVE_WINDOW_SYSTEM must be too.
   
......
...@@ -189,7 +189,7 @@ NS_SUPPORT=@NS_SUPPORT@ ...@@ -189,7 +189,7 @@ NS_SUPPORT=@NS_SUPPORT@
GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@ GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@
GNUSTEP_SYSTEM_LIBRARIES=@GNUSTEP_SYSTEM_LIBRARIES@ 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@ FONT_OBJ=@FONT_OBJ@
## ${lispsource}mouse.elc if HAVE_GPM, otherwise empty. ## ${lispsource}mouse.elc if HAVE_GPM, otherwise empty.
...@@ -294,6 +294,7 @@ LIBXMENU=@LIBXMENU@ ...@@ -294,6 +294,7 @@ LIBXMENU=@LIBXMENU@
LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
LIBX_OTHER=@LIBX_OTHER@ LIBX_OTHER=@LIBX_OTHER@
FONT_DRIVERS=$(FONT_OBJ)
#endif /* HAVE_X_WINDOWS */ #endif /* HAVE_X_WINDOWS */
...@@ -353,10 +354,6 @@ ns_appresdir=@ns_appresdir@/ ...@@ -353,10 +354,6 @@ ns_appresdir=@ns_appresdir@/
ns_appsrc=@ns_appsrc@ ns_appsrc=@ns_appsrc@
#endif /* HAVE_NS */ #endif /* HAVE_NS */
#ifdef HAVE_X_WINDOWS
FONT_DRIVERS=$(FONT_OBJ)
#endif /* HAVE_X_WINDOWS */
/* lastfile must follow all files /* lastfile must follow all files
whose initialized data areas should be dumped as pure by dump-emacs. */ 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 \ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
...@@ -425,20 +422,16 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(gmallocobj) $(rallocobj) \ ...@@ -425,20 +422,16 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(gmallocobj) $(rallocobj) \
#endif #endif
#ifdef HAVE_WINDOW_SYSTEM #ifdef HAVE_WINDOW_SYSTEM
#define TOOLTIP_SUPPORT ${lispsource}tooltip.elc
#ifdef HAVE_X_WINDOWS #ifdef HAVE_X_WINDOWS
#define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT) #define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT)
#else #else
#define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT) #define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT)
#endif #endif /* HAVE_X_WINDOWS */
#else
#define WINDOW_SUPPORT
#endif
#ifdef HAVE_WINDOW_SYSTEM
#define TOOLTIP_SUPPORT ${lispsource}tooltip.elc
#else #else
#define TOOLTIP_SUPPORT #define TOOLTIP_SUPPORT
#endif #define WINDOW_SUPPORT
#endif /* HAVE_WINDOW_SYSTEM */
/* This is the platform-specific list of Lisp files loaded into the /* 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 dumped Emacs. It is arranged like this because it is easier to generate
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment