aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Rumney2008-02-23 00:17:28 +0000
committerJason Rumney2008-02-23 00:17:28 +0000
commitcba3dac5b546fa81c60f1585e58bbbef98020b0c (patch)
tree70f0e3e6b24068df1eb449f76cd0ca9c302b415f
parent986845aff72be6996062f23ac09adda0f743b3c3 (diff)
downloademacs-cba3dac5b546fa81c60f1585e58bbbef98020b0c.tar.gz
emacs-cba3dac5b546fa81c60f1585e58bbbef98020b0c.zip
(WINS_ALMOST): Remove term.
(WINS): Add term here. (custom-deps, finder-data): Use WINS_ALMOST.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/makefile.w32-in10
2 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e62dbf6f15c..f7a17f14a52 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12008-02-23 Jason Rumney <jasonr@gnu.org>
2
3 * makefile.w32-in (WINS_ALMOST): Remove term.
4 (WINS): Add term here.
5 (custom-deps, finder-data): Use WINS_ALMOST.
6
12008-02-22 Juanma Barranquero <lekktu@gmail.com> 72008-02-22 Juanma Barranquero <lekktu@gmail.com>
2 8
3 * faces.el (font-weight-table): Fix value of `semi-light'. 9 * faces.el (font-weight-table): Fix value of `semi-light'.
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 3fde5aa8ef6..205c29cb669 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -93,11 +93,11 @@ WINS_ALMOST=\
93 nxml \ 93 nxml \
94 play \ 94 play \
95 progmodes \ 95 progmodes \
96 term \
97 textmodes \ 96 textmodes \
98 url 97 url
99 98
100WINS= $(WINS_ALMOST) \ 99WINS= $(WINS_ALMOST) \
100 term \
101 obsolete 101 obsolete
102 102
103doit: 103doit:
@@ -107,12 +107,12 @@ $(lisp)/cus-load.el:
107# WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as 107# WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
108# this can break with GNU Make 3.81 and later if sh.exe is used. 108# this can break with GNU Make 3.81 and later if sh.exe is used.
109custom-deps: $(lisp)/cus-load.el $(lisp)/loaddefs.el doit 109custom-deps: $(lisp)/cus-load.el $(lisp)/loaddefs.el doit
110 @echo Directories: $(WINS) 110 @echo Directories: $(WINS_ALMOST)
111 -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS) 111 -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS_ALMOST)
112 112
113finder-data: $(lisp)/loaddefs.el doit 113finder-data: $(lisp)/loaddefs.el doit
114 @echo Directories: $(WINS) 114 @echo Directories: $(WINS_ALMOST)
115 $(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) $(WINS) 115 $(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) $(WINS_ALMOST)
116 116
117$(lisp)/loaddefs.el: 117$(lisp)/loaddefs.el:
118 $(MAKE) $(MFLAGS) loaddefs.el-$(SHELLTYPE) 118 $(MAKE) $(MFLAGS) loaddefs.el-$(SHELLTYPE)