aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2009-10-02 12:19:24 +0000
committerEli Zaretskii2009-10-02 12:19:24 +0000
commitd2bda74fc92d399a4855f1ba3fd148448ffe516b (patch)
treefdcb16df11bcb9c9e55d47ec8287012907b942d7
parent3999968a738479642f0b508da1cf1920e254c079 (diff)
downloademacs-d2bda74fc92d399a4855f1ba3fd148448ffe516b.tar.gz
emacs-d2bda74fc92d399a4855f1ba3fd148448ffe516b.zip
(WINS_BASIC): Remove cedet.
(WINS_CEDET): Add cedet. (update-subdirs-SH): Use $(WINS_SUBDIR), not $(WINS).
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/makefile.w32-in4
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc330ada560..91ad3c83627 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12009-10-02 Eli Zaretskii <eliz@gnu.org>
2
3 * makefile.w32-in (WINS_BASIC): Remove cedet.
4 (WINS_CEDET): Add cedet.
5 (update-subdirs-SH): Use $(WINS_SUBDIR), not $(WINS).
6
12009-10-02 Kevin Ryde <user42@zip.com.au> 72009-10-02 Kevin Ryde <user42@zip.com.au>
2 8
3 * net/browse-url.el (browse-url): Pass any symbol in 9 * net/browse-url.el (browse-url): Pass any symbol in
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 99511f4544d..42fd0061b5f 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -84,6 +84,7 @@ emacs = "$(EMACS)" $(EMACSOPT)
84 84
85# Have to define the list of subdirs manually when not using sh. 85# Have to define the list of subdirs manually when not using sh.
86WINS_CEDET=\ 86WINS_CEDET=\
87 cedet \
87 cedet/ede \ 88 cedet/ede \
88 cedet/semantic \ 89 cedet/semantic \
89 cedet/srecode 90 cedet/srecode
@@ -91,7 +92,6 @@ WINS_CEDET=\
91WINS_BASIC=\ 92WINS_BASIC=\
92 calc \ 93 calc \
93 calendar \ 94 calendar \
94 cedet \
95 emacs-lisp \ 95 emacs-lisp \
96 emulation \ 96 emulation \
97 erc \ 97 erc \
@@ -215,7 +215,7 @@ update-subdirs-CMD: doit
215 215
216update-subdirs-SH: doit 216update-subdirs-SH: doit
217 $(srcdir)/update-subdirs $(lisp); \ 217 $(srcdir)/update-subdirs $(lisp); \
218 for file in $(WINS); do \ 218 for file in $(WINS_SUBDIR); do \
219 $(srcdir)/update-subdirs $$file; \ 219 $(srcdir)/update-subdirs $$file; \
220 done; 220 done;
221 221