aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-05-12 21:15:12 -0700
committerGlenn Morris2010-05-12 21:15:12 -0700
commit6192e163410a1ffdcee70652952c7744ba4abd6f (patch)
tree75f2dfdeeaa6205efc96516a3260418ae5d0f76e
parent4286c48d4b255139761c7d3ec14fc020f3f071b5 (diff)
downloademacs-6192e163410a1ffdcee70652952c7744ba4abd6f.tar.gz
emacs-6192e163410a1ffdcee70652952c7744ba4abd6f.zip
Remove WINNT_SUPPORT from src/Makefile.in,
* src/Makefile.in (WINNT_SUPPORT): Remove, nt build does not use this file but rather makefile.w32-in. (lisp): Remove WINNT_SUPPORT.
-rw-r--r--src/ChangeLog3
-rw-r--r--src/Makefile.in10
2 files changed, 3 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a95c5b06f09..f812146c833 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 (WINNT_SUPPORT): Remove, nt build does not use this file.
4 (lisp): Remove WINNT_SUPPORT.
5
3 * Makefile.in (OLDXMENU, LIBXMENU) [!HAVE_MENUS]: 6 * Makefile.in (OLDXMENU, LIBXMENU) [!HAVE_MENUS]:
4 Let configure set these variables (to empty) in this case as well. 7 Let configure set these variables (to empty) in this case as well.
5 8
diff --git a/src/Makefile.in b/src/Makefile.in
index bbc598c3391..ceff99225d7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -436,15 +436,6 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(gmallocobj) $(rallocobj) \
436#define WINDOW_SUPPORT 436#define WINDOW_SUPPORT
437#endif 437#endif
438 438
439#ifdef WINDOWSNT
440#define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \
441 ${lispsource}dos-w32.elc ${lispsource}w32-vars.elc \
442 ${lispsource}w32-fns.elc ${lispsource}term/common-win.elc \
443 ${lispsource}term/w32-win.elc
444#else
445#define WINNT_SUPPORT
446#endif
447
448#ifdef HAVE_WINDOW_SYSTEM 439#ifdef HAVE_WINDOW_SYSTEM
449#define TOOLTIP_SUPPORT ${lispsource}tooltip.elc 440#define TOOLTIP_SUPPORT ${lispsource}tooltip.elc
450#else 441#else
@@ -549,7 +540,6 @@ lisp= \
549 ${lispsource}epa-hook.elc \ 540 ${lispsource}epa-hook.elc \
550 TOOLTIP_SUPPORT \ 541 TOOLTIP_SUPPORT \
551 MSDOS_SUPPORT \ 542 MSDOS_SUPPORT \
552 WINNT_SUPPORT \
553 WINDOW_SUPPORT \ 543 WINDOW_SUPPORT \
554 ${NS_SUPPORT} \ 544 ${NS_SUPPORT} \
555 ${lispsource}widget.elc \ 545 ${lispsource}widget.elc \