[Emacs-diffs] /srv/bzr/emacs/trunk r100069: src/Makefile.in minor simplification,

[Glenn Morris]

------------------------------------------------------------
revno: 100069
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2010-04-28 00:25:47 -0700
message:
  src/Makefile.in minor simplification,
  * src/Makefile.in (BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT): New variables.
  (WINDOW_SUPPORT) [HAVE_WINDOW_SYSTEM]: Use them.
modified:
  src/ChangeLog
  src/Makefile.in

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-28 07:20:39 +0000
+++ b/src/ChangeLog     2010-04-28 07:25:47 +0000
@@ -1,5 +1,8 @@
 2010-04-28  Glenn Morris  <address@hidden>
 
+       * Makefile.in (BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT): New variables.
+       (WINDOW_SUPPORT) [HAVE_WINDOW_SYSTEM]: Use them.
+
        * Makefile.in (CYGWIN_OBJ): Set with configure, not cpp.
 
        * Makefile.in (GPM_MOUSE_SUPPORT): New, set by configure.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-04-28 07:20:39 +0000
+++ b/src/Makefile.in   2010-04-28 07:25:47 +0000
@@ -119,6 +119,13 @@
 ## Not used if HAVE_MOUSE.
 address@hidden@
 
+BASE_WINDOW_SUPPORT=${lispsource}fringe.elc ${lispsource}image.elc \
+  ${lispsource}international/fontset.elc ${lispsource}dnd.elc \
+  ${lispsource}tool-bar.elc ${lispsource}mwheel.elc
+
+X_WINDOW_SUPPORT=${lispsource}x-dnd.elc ${lispsource}term/common-win.elc \
+  ${lispsource}term/x-win.elc ${lispsource}dynamic-setting.elc
+
 LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
 
 INTERVALS_H = dispextern.h intervals.h composite.h
@@ -469,15 +476,9 @@
 
 #ifdef HAVE_WINDOW_SYSTEM
 #ifdef HAVE_X_WINDOWS
-#define WINDOW_SUPPORT ${lispsource}fringe.elc ${lispsource}image.elc \
- ${lispsource}international/fontset.elc ${lispsource}dnd.elc \
- ${lispsource}tool-bar.elc ${lispsource}mwheel.elc ${lispsource}x-dnd.elc \
- ${lispsource}term/common-win.elc ${lispsource}term/x-win.elc \
- ${lispsource}dynamic-setting.elc
+#define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT)
 #else
-#define WINDOW_SUPPORT ${lispsource}fringe.elc ${lispsource}image.elc \
- ${lispsource}international/fontset.elc ${lispsource}dnd.elc \
- ${lispsource}tool-bar.elc ${lispsource}mwheel.elc
+#define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT)
 #endif
 #else
 #define WINDOW_SUPPORT