aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2012-11-15 17:21:50 +0100
committerJuanma Barranquero2012-11-15 17:21:50 +0100
commitb72c161c5bda1836b0a86ceba1bd968abd00ff1a (patch)
treee0b9113e84a869f03e3ed4f0a79303a2f0ce5ca6
parentb24696b8c857f76f4fa5769578e9b8db279a2aa8 (diff)
downloademacs-b72c161c5bda1836b0a86ceba1bd968abd00ff1a.tar.gz
emacs-b72c161c5bda1836b0a86ceba1bd968abd00ff1a.zip
src/makefile.w32-in: Update dependencies.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/makefile.w32-in2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d309931e8e6..8caaa2f68e0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-11-15 Juanma Barranquero <lekktu@gmail.com>
2
3 * makefile.w32-in ($(BLD)/dispnew.$(O), $(BLD)/emacs.$(O)):
4 Update dependencies.
5
12012-11-15 Paul Eggert <eggert@cs.ucla.edu> 62012-11-15 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * eval.c (mark_backtrace) [BYTE_MARK_STACK]: Remove stray '*'. 8 * eval.c (mark_backtrace) [BYTE_MARK_STACK]: Remove stray '*'.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index f5cab34d7dc..69fd6857f86 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -737,6 +737,7 @@ $(BLD)/dispnew.$(O) : \
737 $(SRC)/termchar.h \ 737 $(SRC)/termchar.h \
738 $(SRC)/w32.h \ 738 $(SRC)/w32.h \
739 $(NT_INC)/unistd.h \ 739 $(NT_INC)/unistd.h \
740 $(GNU_LIB)/fpending.h \
740 $(BUFFER_H) \ 741 $(BUFFER_H) \
741 $(CHARACTER_H) \ 742 $(CHARACTER_H) \
742 $(CONFIG_H) \ 743 $(CONFIG_H) \
@@ -802,6 +803,7 @@ $(BLD)/emacs.$(O) : \
802 $(SRC)/w32select.h \ 803 $(SRC)/w32select.h \
803 $(NT_INC)/sys/file.h \ 804 $(NT_INC)/sys/file.h \
804 $(NT_INC)/unistd.h \ 805 $(NT_INC)/unistd.h \
806 $(GNU_LIB)/close-stream.h \
805 $(GNU_LIB)/ignore-value.h \ 807 $(GNU_LIB)/ignore-value.h \
806 $(ATIMER_H) \ 808 $(ATIMER_H) \
807 $(BUFFER_H) \ 809 $(BUFFER_H) \