From faf535f8e65d7817b31e0f85b63d37abfc6195f4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 28 Apr 2010 00:25:47 -0700 Subject: [PATCH 1/1] src/Makefile.in minor simplification, * src/Makefile.in (BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT): New variables. (WINDOW_SUPPORT) [HAVE_WINDOW_SYSTEM]: Use them. --- src/ChangeLog | 3 +++ src/Makefile.in | 17 +++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index d8c927b89e..e80ee7c207 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2010-04-28 Glenn Morris + * 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. diff --git a/src/Makefile.in b/src/Makefile.in index bb45ad0b19..974a2332be 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -119,6 +119,13 @@ FONT_OBJ=@FONT_OBJ@ ## Not used if HAVE_MOUSE. GPM_MOUSE_SUPPORT=@GPM_MOUSE_SUPPORT@ +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 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(WIDGET_OBJ) $(LIBOBJS) #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 -- 2.39.2