aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2008-11-30 14:18:26 +0000
committerJuanma Barranquero2008-11-30 14:18:26 +0000
commitf952c61ccf52e707b4dfe443768d5d12166257d8 (patch)
tree21df099cdb33fd8b7bdb332abbc9549f35b41eb9 /src
parent835404e5fd2230b31b6907436b976b21a17bb3ef (diff)
downloademacs-f952c61ccf52e707b4dfe443768d5d12166257d8.tar.gz
emacs-f952c61ccf52e707b4dfe443768d5d12166257d8.zip
* makefile.w32-in ($(BLD)/abbrev.$(O)): Remove.
It was accidentally restored by the Unicode merge.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/makefile.w32-in12
2 files changed, 3 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9fa128596bb..1e5147245f1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12008-11-30 Juanma Barranquero <lekktu@gmail.com> 12008-11-30 Juanma Barranquero <lekktu@gmail.com>
2 2
3 * makefile.w32-in ($(BLD)/abbrev.$(O)): Remove.
4 It was accidentally restored by the Unicode merge.
5
3 * w32proc.c (Fw32_get_locale_info): Fix typo in docstring. 6 * w32proc.c (Fw32_get_locale_info): Fix typo in docstring.
4 7
52008-11-29 Juanma Barranquero <lekktu@gmail.com> 82008-11-29 Juanma Barranquero <lekktu@gmail.com>
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 09a3a1ef580..8f9d4f124b0 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -281,18 +281,6 @@ CONFIG_H = $(EMACS_ROOT)/src/s/ms-w32.h \
281 $(EMACS_ROOT)/src/m/intel386.h \ 281 $(EMACS_ROOT)/src/m/intel386.h \
282 $(EMACS_ROOT)/src/config.h 282 $(EMACS_ROOT)/src/config.h
283 283
284$(BLD)/abbrev.$(O) : \
285 $(SRC)/abbrev.c \
286 $(CONFIG_H) \
287 $(SRC)/buffer.h \
288 $(SRC)/character.h \
289 $(SRC)/charset.h \
290 $(SRC)/commands.h \
291 $(SRC)/dispextern.h \
292 $(SRC)/syntax.h \
293 $(SRC)/w32gui.h \
294 $(SRC)/window.h
295
296$(BLD)/alloc.$(O) : \ 284$(BLD)/alloc.$(O) : \
297 $(SRC)/alloc.c \ 285 $(SRC)/alloc.c \
298 $(CONFIG_H) \ 286 $(CONFIG_H) \