[Emacs-diffs] /srv/bzr/emacs/trunk r100258: Unify some conditionals in src/Makefile.in.

[Glenn Morris]

------------------------------------------------------------
revno: 100258
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2010-05-13 00:57:28 -0700
message:
  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.
modified:
  src/ChangeLog
  src/Makefile.in

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-13 07:41:37 +0000
+++ b/src/ChangeLog     2010-05-13 07:57:28 +0000
@@ -1,5 +1,8 @@
 2010-05-13  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-13 07:41:37 +0000
+++ b/src/Makefile.in   2010-05-13 07:57:28 +0000
@@ -189,7 +189,7 @@
 address@hidden@
 address@hidden@
 
-## Only used if HAVE_X_WINDOWS and HAVE_WINDOW_SYSTEM.
+## Only used if HAVE_X_WINDOWS.
 address@hidden@
 
 ## ${lispsource}mouse.elc if HAVE_GPM, otherwise empty.
@@ -294,6 +294,7 @@
 LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
 LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
 address@hidden@
+FONT_DRIVERS=$(FONT_OBJ)
 #endif /* HAVE_X_WINDOWS */
 
 
@@ -353,10 +354,6 @@
 address@hidden@
 #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
+#endif /* HAVE_X_WINDOWS */
 #else
+#define TOOLTIP_SUPPORT
 #define WINDOW_SUPPORT
-#endif
-
-#ifdef HAVE_WINDOW_SYSTEM
-#define TOOLTIP_SUPPORT ${lispsource}tooltip.elc
-#else
-#define TOOLTIP_SUPPORT
-#endif
+#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