diff options
| author | Glenn Morris <[email protected]> | 2010-05-13 00:41:37 -0700 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2010-05-13 00:41:37 -0700 |
| commit | d5e982a6c1eb2a4ed1af368b6ba815e490b3b9d7 (patch) | |
| tree | 2af05411571764dfcb1ffc0147c5728fc422061a /src | |
| parent | 3536f9934929a86c827fff09247b8fea54dd5f02 (diff) | |
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/ChangeLog | 3 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3b47ff64b4..2ec13974f3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2010-05-13 Glenn Morris <[email protected]> + * 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 ceff99225d..7ea2669fcf 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. */ |