aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2012-06-16 15:44:20 +0200
committerJuanma Barranquero2012-06-16 15:44:20 +0200
commit0fb52f118bd1056a934a7013e593ddd091b000b6 (patch)
tree5d2d85b4508aacd31f5b80b8462a2dcc3a930a23 /src
parent6eb93f60be979b75f803df4963f69c09702f2225 (diff)
downloademacs-0fb52f118bd1056a934a7013e593ddd091b000b6.tar.gz
emacs-0fb52f118bd1056a934a7013e593ddd091b000b6.zip
src/makefile.w32-in: Update dependencies.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog8
-rw-r--r--src/makefile.w32-in12
2 files changed, 19 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ec92eadaa39..321c3b9c62f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
12012-06-16 Juanma Barranquero <lekktu@gmail.com>
2
3 * makefile.w32-in ($(BLD)/emacs.$(O), $(BLD)/fringe.$(O))
4 ($(BLD)/xml.$(O), $(BLD)/intervals.$(O), $(BLD)/macros.$(O))
5 ($(BLD)/minibuf.$(O), $(BLD)/regex.$(O), $(BLD)/region-cache.$(O))
6 ($(BLD)/textprop.$(O), $(BLD)/undo.$(O), $(BLD)/window.$(O))
7 ($(BLD)/w32select.$(O)): Update dependencies.
8
12012-06-16 Andreas Schwab <schwab@linux-m68k.org> 92012-06-16 Andreas Schwab <schwab@linux-m68k.org>
2 10
3 * buffer.h (FETCH_MULTIBYTE_CHAR): Define as inline. 11 * buffer.h (FETCH_MULTIBYTE_CHAR): Define as inline.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 9c8272f6abb..be9d4a3361c 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -782,6 +782,7 @@ $(BLD)/emacs.$(O) : \
782 $(NT_INC)/sys/file.h \ 782 $(NT_INC)/sys/file.h \
783 $(NT_INC)/unistd.h \ 783 $(NT_INC)/unistd.h \
784 $(BLOCKINPUT_H) \ 784 $(BLOCKINPUT_H) \
785 $(CHARACTER_H) \
785 $(CONFIG_H) \ 786 $(CONFIG_H) \
786 $(FRAME_H) \ 787 $(FRAME_H) \
787 $(INTERVALS_H) \ 788 $(INTERVALS_H) \
@@ -921,6 +922,7 @@ $(BLD)/fringe.$(O) : \
921 $(SRC)/fringe.c \ 922 $(SRC)/fringe.c \
922 $(SRC)/buffer.h \ 923 $(SRC)/buffer.h \
923 $(BLOCKINPUT_H) \ 924 $(BLOCKINPUT_H) \
925 $(CHARACTER_H) \
924 $(CONFIG_H) \ 926 $(CONFIG_H) \
925 $(DISPEXTERN_H) \ 927 $(DISPEXTERN_H) \
926 $(FRAME_H) \ 928 $(FRAME_H) \
@@ -945,6 +947,7 @@ $(BLD)/xml.$(O) : \
945 $(SRC)/xml.c \ 947 $(SRC)/xml.c \
946 $(SRC)/buffer.h \ 948 $(SRC)/buffer.h \
947 $(SRC)/w32.h \ 949 $(SRC)/w32.h \
950 $(CHARACTER_H) \
948 $(CONFIG_H) \ 951 $(CONFIG_H) \
949 $(LISP_H) 952 $(LISP_H)
950 953
@@ -1003,6 +1006,7 @@ $(BLD)/intervals.$(O) : \
1003 $(SRC)/keymap.h \ 1006 $(SRC)/keymap.h \
1004 $(SRC)/puresize.h \ 1007 $(SRC)/puresize.h \
1005 $(GNU_LIB)/intprops.h \ 1008 $(GNU_LIB)/intprops.h \
1009 $(CHARACTER_H) \
1006 $(CONFIG_H) \ 1010 $(CONFIG_H) \
1007 $(INTERVALS_H) \ 1011 $(INTERVALS_H) \
1008 $(KEYBOARD_H) \ 1012 $(KEYBOARD_H) \
@@ -1082,6 +1086,7 @@ $(BLD)/macros.$(O) : \
1082 $(SRC)/buffer.h \ 1086 $(SRC)/buffer.h \
1083 $(SRC)/commands.h \ 1087 $(SRC)/commands.h \
1084 $(SRC)/macros.h \ 1088 $(SRC)/macros.h \
1089 $(CHARACTER_H) \
1085 $(CONFIG_H) \ 1090 $(CONFIG_H) \
1086 $(KEYBOARD_H) \ 1091 $(KEYBOARD_H) \
1087 $(LISP_H) \ 1092 $(LISP_H) \
@@ -1114,6 +1119,7 @@ $(BLD)/minibuf.$(O) : \
1114 $(SRC)/commands.h \ 1119 $(SRC)/commands.h \
1115 $(SRC)/keymap.h \ 1120 $(SRC)/keymap.h \
1116 $(SRC)/syntax.h \ 1121 $(SRC)/syntax.h \
1122 $(CHARACTER_H) \
1117 $(CONFIG_H) \ 1123 $(CONFIG_H) \
1118 $(DISPEXTERN_H) \ 1124 $(DISPEXTERN_H) \
1119 $(FRAME_H) \ 1125 $(FRAME_H) \
@@ -1259,7 +1265,6 @@ $(BLD)/regex.$(O) : \
1259 $(SRC)/category.h \ 1265 $(SRC)/category.h \
1260 $(SRC)/regex.h \ 1266 $(SRC)/regex.h \
1261 $(SRC)/syntax.h \ 1267 $(SRC)/syntax.h \
1262 $(NT_INC)/unistd.h \
1263 $(CHARACTER_H) \ 1268 $(CHARACTER_H) \
1264 $(CONFIG_H) \ 1269 $(CONFIG_H) \
1265 $(LISP_H) 1270 $(LISP_H)
@@ -1268,6 +1273,7 @@ $(BLD)/region-cache.$(O) : \
1268 $(SRC)/region-cache.c \ 1273 $(SRC)/region-cache.c \
1269 $(SRC)/buffer.h \ 1274 $(SRC)/buffer.h \
1270 $(SRC)/region-cache.h \ 1275 $(SRC)/region-cache.h \
1276 $(CHARACTER_H) \
1271 $(CONFIG_H) \ 1277 $(CONFIG_H) \
1272 $(LISP_H) 1278 $(LISP_H)
1273 1279
@@ -1390,6 +1396,7 @@ $(BLD)/terminal.$(O) : \
1390$(BLD)/textprop.$(O) : \ 1396$(BLD)/textprop.$(O) : \
1391 $(SRC)/textprop.c \ 1397 $(SRC)/textprop.c \
1392 $(SRC)/buffer.h \ 1398 $(SRC)/buffer.h \
1399 $(CHARACTER_H) \
1393 $(CONFIG_H) \ 1400 $(CONFIG_H) \
1394 $(INTERVALS_H) \ 1401 $(INTERVALS_H) \
1395 $(LISP_H) \ 1402 $(LISP_H) \
@@ -1405,6 +1412,7 @@ $(BLD)/undo.$(O) : \
1405 $(SRC)/undo.c \ 1412 $(SRC)/undo.c \
1406 $(SRC)/buffer.h \ 1413 $(SRC)/buffer.h \
1407 $(SRC)/commands.h \ 1414 $(SRC)/commands.h \
1415 $(CHARACTER_H) \
1408 $(CONFIG_H) \ 1416 $(CONFIG_H) \
1409 $(LISP_H) \ 1417 $(LISP_H) \
1410 $(WINDOW_H) 1418 $(WINDOW_H)
@@ -1430,6 +1438,7 @@ $(BLD)/window.$(O) : \
1430 $(SRC)/keymap.h \ 1438 $(SRC)/keymap.h \
1431 $(SRC)/termchar.h \ 1439 $(SRC)/termchar.h \
1432 $(BLOCKINPUT_H) \ 1440 $(BLOCKINPUT_H) \
1441 $(CHARACTER_H) \
1433 $(CONFIG_H) \ 1442 $(CONFIG_H) \
1434 $(DISPEXTERN_H) \ 1443 $(DISPEXTERN_H) \
1435 $(FRAME_H) \ 1444 $(FRAME_H) \
@@ -1519,6 +1528,7 @@ $(BLD)/w32menu.$(O) : \
1519 $(SRC)/keymap.h \ 1528 $(SRC)/keymap.h \
1520 $(SRC)/w32heap.h \ 1529 $(SRC)/w32heap.h \
1521 $(BLOCKINPUT_H) \ 1530 $(BLOCKINPUT_H) \
1531 $(CHARACTER_H) \
1522 $(CHARSET_H) \ 1532 $(CHARSET_H) \
1523 $(CODING_H) \ 1533 $(CODING_H) \
1524 $(CONFIG_H) \ 1534 $(CONFIG_H) \