From: Glenn Morris Date: Thu, 13 May 2010 07:41:37 +0000 (-0700) Subject: Minor simplification for src/Makefile.in. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~211^2^2~16 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d5e982a6c1eb2a4ed1af368b6ba815e490b3b9d7;p=emacs.git Minor simplification for src/Makefile.in. * src/Makefile.in (FONT_DRIVERS): If HAVE_X_WINDOWS is defined, HAVE_WINDOW_SYSTEM must be too. --- diff --git a/src/ChangeLog b/src/ChangeLog index 3b47ff64b45..2ec13974f33 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2010-05-13 Glenn Morris + * Makefile.in (FONT_DRIVERS): If HAVE_X_WINDOWS is defined, + HAVE_WINDOW_SYSTEM must be too. + * Makefile.in (WINNT_SUPPORT): Remove, nt build does not use this file. (lisp): Remove WINNT_SUPPORT. diff --git a/src/Makefile.in b/src/Makefile.in index ceff99225d7..7ea2669fcfb 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -353,11 +353,9 @@ ns_appresdir=@ns_appresdir@/ ns_appsrc=@ns_appsrc@ #endif /* HAVE_NS */ -#ifdef HAVE_WINDOW_SYSTEM #ifdef HAVE_X_WINDOWS FONT_DRIVERS=$(FONT_OBJ) #endif /* HAVE_X_WINDOWS */ -#endif /* HAVE_WINDOW_SYSTEM */ /* lastfile must follow all files whose initialized data areas should be dumped as pure by dump-emacs. */