aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2012-05-10 16:34:43 +0200
committerJuanma Barranquero2012-05-10 16:34:43 +0200
commit75aafb17a6569408f2fcf9076ebf62f38bef1b09 (patch)
tree112adc699fad504e7a9267b0bcccd95653a92be5 /src
parentff4a64740df15b9e31121064b46d739b76a74e0d (diff)
downloademacs-75aafb17a6569408f2fcf9076ebf62f38bef1b09.tar.gz
emacs-75aafb17a6569408f2fcf9076ebf62f38bef1b09.zip
src/makefile.w32-in: Update dependencies.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/makefile.w32-in3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 84764cfc5fc..d86d55816f4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-05-10 Juanma Barranquero <lekktu@gmail.com>
2
3 * makefile.w32-in ($(BLD)/gmalloc.$(O), $(BLD)/w32menu.$(O)):
4 Update dependencies.
5
12012-05-10 Paul Eggert <eggert@cs.ucla.edu> 62012-05-10 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * xgselect.c (xg_select): Put maxfds+1 into a var. 8 * xgselect.c (xg_select): Put maxfds+1 into a var.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 303445bc2d6..f62c501e1fa 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -930,7 +930,7 @@ $(BLD)/fringe.$(O) : \
930 930
931$(BLD)/gmalloc.$(O) : \ 931$(BLD)/gmalloc.$(O) : \
932 $(SRC)/gmalloc.c \ 932 $(SRC)/gmalloc.c \
933 $(SRC)/getpagesize.h \ 933 $(NT_INC)/stdint.h \
934 $(NT_INC)/unistd.h \ 934 $(NT_INC)/unistd.h \
935 $(CONFIG_H) 935 $(CONFIG_H)
936 936
@@ -1514,6 +1514,7 @@ $(BLD)/w32menu.$(O) : \
1514 $(SRC)/w32menu.c \ 1514 $(SRC)/w32menu.c \
1515 $(SRC)/buffer.h \ 1515 $(SRC)/buffer.h \
1516 $(SRC)/keymap.h \ 1516 $(SRC)/keymap.h \
1517 $(SRC)/w32heap.h \
1517 $(BLOCKINPUT_H) \ 1518 $(BLOCKINPUT_H) \
1518 $(CHARSET_H) \ 1519 $(CHARSET_H) \
1519 $(CODING_H) \ 1520 $(CODING_H) \