mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-13 09:32:47 +00:00
Code Issues Releases Activity

Unify some conditionals in src/Makefile.in.

Browse Source 
* src/Makefile.in (FONT_DRIVERS): Place with other HAVE_X_WINDOWS stuff.
(TOOLTIP_SUPPORT): Place with other HAVE_WINDOW_SYSTEM stuff.
This commit is contained in:
Glenn Morris 2010-05-13 00:57:28 -07:00
parent d5e982a6c1
commit 3369c79f8a
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ChangeLog
View File

@ -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.

19
src/Makefile.in
View File

@ -189,7 +189,7 @@ NS_SUPPORT=@NS_SUPPORT@
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 @@ LIBXMENU=@LIBXMENU@
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_appresdir=@ns_appresdir@/
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 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(gmallocobj) $(rallocobj) \
#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