aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2010-05-13 00:41:37 -0700
committerGlenn Morris2010-05-13 00:41:37 -0700
commitd5e982a6c1eb2a4ed1af368b6ba815e490b3b9d7 (patch)
tree2af05411571764dfcb1ffc0147c5728fc422061a /src
parent3536f9934929a86c827fff09247b8fea54dd5f02 (diff)
downloademacs-d5e982a6c1eb2a4ed1af368b6ba815e490b3b9d7.tar.gz
emacs-d5e982a6c1eb2a4ed1af368b6ba815e490b3b9d7.zip
Minor simplification for src/Makefile.in.
* src/Makefile.in (FONT_DRIVERS): If HAVE_X_WINDOWS is defined, HAVE_WINDOW_SYSTEM must be too.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/Makefile.in2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3b47ff64b45..2ec13974f33 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12010-05-13 Glenn Morris <rgm@gnu.org> 12010-05-13 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in (FONT_DRIVERS): If HAVE_X_WINDOWS is defined,
4 HAVE_WINDOW_SYSTEM must be too.
5
3 * Makefile.in (WINNT_SUPPORT): Remove, nt build does not use this file. 6 * Makefile.in (WINNT_SUPPORT): Remove, nt build does not use this file.
4 (lisp): Remove WINNT_SUPPORT. 7 (lisp): Remove WINNT_SUPPORT.
5 8
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@/
353ns_appsrc=@ns_appsrc@ 353ns_appsrc=@ns_appsrc@
354#endif /* HAVE_NS */ 354#endif /* HAVE_NS */
355 355
356#ifdef HAVE_WINDOW_SYSTEM
357#ifdef HAVE_X_WINDOWS 356#ifdef HAVE_X_WINDOWS
358FONT_DRIVERS=$(FONT_OBJ) 357FONT_DRIVERS=$(FONT_OBJ)
359#endif /* HAVE_X_WINDOWS */ 358#endif /* HAVE_X_WINDOWS */
360#endif /* HAVE_WINDOW_SYSTEM */
361 359
362/* lastfile must follow all files 360/* lastfile must follow all files
363 whose initialized data areas should be dumped as pure by dump-emacs. */ 361 whose initialized data areas should be dumped as pure by dump-emacs. */