diff options
| author | Juanma Barranquero | 2011-05-06 17:37:11 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2011-05-06 17:37:11 +0200 |
| commit | af4c0e284957da53404fbdd7c80fe0f5c22f8599 (patch) | |
| tree | 7b26ccb50f2caa1e529ce8b379cdb8582fdf222a /src | |
| parent | 0a47eac473aec19f1b964cc06649dc0007e05f1f (diff) | |
| download | emacs-af4c0e284957da53404fbdd7c80fe0f5c22f8599.tar.gz emacs-af4c0e284957da53404fbdd7c80fe0f5c22f8599.zip | |
src/makefile.w32-in: Update dependencies.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/makefile.w32-in | 27 |
2 files changed, 13 insertions, 20 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3febe41eb29..8f8e62821a9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-05-06 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * makefile.w32-in: Update dependencies. | ||
| 4 | (LISP_H): Add inttypes.h and stdin.h. | ||
| 5 | (PROCESS_H): Add unistd.h. | ||
| 6 | |||
| 1 | 2011-05-06 Eli Zaretskii <eliz@gnu.org> | 7 | 2011-05-06 Eli Zaretskii <eliz@gnu.org> |
| 2 | 8 | ||
| 3 | * lread.c: Include limits.h (fixes the MS-Windows build broken by | 9 | * lread.c: Include limits.h (fixes the MS-Windows build broken by |
diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 4296cd64c6f..fb216eb16a6 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in | |||
| @@ -380,13 +380,17 @@ CONFIG_H = $(EMACS_ROOT)/src/s/ms-w32.h \ | |||
| 380 | $(EMACS_ROOT)/src/m/intel386.h \ | 380 | $(EMACS_ROOT)/src/m/intel386.h \ |
| 381 | $(EMACS_ROOT)/src/config.h \ | 381 | $(EMACS_ROOT)/src/config.h \ |
| 382 | $(EMACS_ROOT)/nt/inc/sys/stat.h | 382 | $(EMACS_ROOT)/nt/inc/sys/stat.h |
| 383 | LISP_H = $(SRC)/lisp.h $(SRC)/globals.h | 383 | LISP_H = $(SRC)/lisp.h \ |
| 384 | PROCESS_H = $(SRC)/process.h $(SRC)/gnutls.h | 384 | $(SRC)/globals.h \ |
| 385 | $(EMACS_ROOT)/nt/inc/inttypes.h \ | ||
| 386 | $(EMACS_ROOT)/nt/inc/stdint.h | ||
| 387 | PROCESS_H = $(SRC)/process.h \ | ||
| 388 | $(EMACS_ROOT)/nt/inc/unistd.h \ | ||
| 389 | $(SRC)/gnutls.h | ||
| 385 | 390 | ||
| 386 | $(BLD)/alloc.$(O) : \ | 391 | $(BLD)/alloc.$(O) : \ |
| 387 | $(SRC)/alloc.c \ | 392 | $(SRC)/alloc.c \ |
| 388 | $(CONFIG_H) \ | 393 | $(CONFIG_H) \ |
| 389 | $(EMACS_ROOT)/nt/inc/unistd.h \ | ||
| 390 | $(EMACS_ROOT)/nt/inc/sys/time.h \ | 394 | $(EMACS_ROOT)/nt/inc/sys/time.h \ |
| 391 | $(LISP_H) \ | 395 | $(LISP_H) \ |
| 392 | $(PROCESS_H) \ | 396 | $(PROCESS_H) \ |
| @@ -486,7 +490,6 @@ $(BLD)/callint.$(O) : \ | |||
| 486 | $(BLD)/callproc.$(O) : \ | 490 | $(BLD)/callproc.$(O) : \ |
| 487 | $(SRC)/callproc.c \ | 491 | $(SRC)/callproc.c \ |
| 488 | $(CONFIG_H) \ | 492 | $(CONFIG_H) \ |
| 489 | $(EMACS_ROOT)/nt/inc/unistd.h \ | ||
| 490 | $(EMACS_ROOT)/nt/inc/sys/file.h \ | 493 | $(EMACS_ROOT)/nt/inc/sys/file.h \ |
| 491 | $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ | 494 | $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ |
| 492 | $(EMACS_ROOT)/nt/inc/sys/time.h \ | 495 | $(EMACS_ROOT)/nt/inc/sys/time.h \ |
| @@ -675,7 +678,6 @@ $(BLD)/dired.$(O) : \ | |||
| 675 | $(BLD)/dispnew.$(O) : \ | 678 | $(BLD)/dispnew.$(O) : \ |
| 676 | $(SRC)/dispnew.c \ | 679 | $(SRC)/dispnew.c \ |
| 677 | $(CONFIG_H) \ | 680 | $(CONFIG_H) \ |
| 678 | $(EMACS_ROOT)/nt/inc/unistd.h \ | ||
| 679 | $(EMACS_ROOT)/nt/inc/sys/time.h \ | 681 | $(EMACS_ROOT)/nt/inc/sys/time.h \ |
| 680 | $(LISP_H) \ | 682 | $(LISP_H) \ |
| 681 | $(PROCESS_H) \ | 683 | $(PROCESS_H) \ |
| @@ -750,7 +752,6 @@ $(BLD)/editfns.$(O) : \ | |||
| 750 | $(BLD)/emacs.$(O) : \ | 752 | $(BLD)/emacs.$(O) : \ |
| 751 | $(SRC)/emacs.c \ | 753 | $(SRC)/emacs.c \ |
| 752 | $(CONFIG_H) \ | 754 | $(CONFIG_H) \ |
| 753 | $(EMACS_ROOT)/nt/inc/unistd.h \ | ||
| 754 | $(EMACS_ROOT)/nt/inc/sys/file.h \ | 755 | $(EMACS_ROOT)/nt/inc/sys/file.h \ |
| 755 | $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ | 756 | $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ |
| 756 | $(EMACS_ROOT)/nt/inc/sys/time.h \ | 757 | $(EMACS_ROOT)/nt/inc/sys/time.h \ |
| @@ -843,7 +844,6 @@ $(BLD)/fns.$(O) : \ | |||
| 843 | $(CONFIG_H) \ | 844 | $(CONFIG_H) \ |
| 844 | $(EMACS_ROOT)/nt/inc/langinfo.h \ | 845 | $(EMACS_ROOT)/nt/inc/langinfo.h \ |
| 845 | $(EMACS_ROOT)/nt/inc/nl_types.h \ | 846 | $(EMACS_ROOT)/nt/inc/nl_types.h \ |
| 846 | $(EMACS_ROOT)/nt/inc/stdint.h \ | ||
| 847 | $(EMACS_ROOT)/nt/inc/unistd.h \ | 847 | $(EMACS_ROOT)/nt/inc/unistd.h \ |
| 848 | $(EMACS_ROOT)/nt/inc/sys/time.h \ | 848 | $(EMACS_ROOT)/nt/inc/sys/time.h \ |
| 849 | $(EMACS_ROOT)/lib/md5.h \ | 849 | $(EMACS_ROOT)/lib/md5.h \ |
| @@ -955,7 +955,6 @@ $(BLD)/gmalloc.$(O) : \ | |||
| 955 | $(BLD)/gnutls.$(O) : \ | 955 | $(BLD)/gnutls.$(O) : \ |
| 956 | $(SRC)/gnutls.c \ | 956 | $(SRC)/gnutls.c \ |
| 957 | $(CONFIG_H) \ | 957 | $(CONFIG_H) \ |
| 958 | $(EMACS_ROOT)/nt/inc/unistd.h \ | ||
| 959 | $(LISP_H) \ | 958 | $(LISP_H) \ |
| 960 | $(PROCESS_H) \ | 959 | $(PROCESS_H) \ |
| 961 | $(SRC)/w32.h | 960 | $(SRC)/w32.h |
| @@ -1043,7 +1042,6 @@ $(BLD)/intervals.$(O) : \ | |||
| 1043 | $(BLD)/keyboard.$(O) : \ | 1042 | $(BLD)/keyboard.$(O) : \ |
| 1044 | $(SRC)/keyboard.c \ | 1043 | $(SRC)/keyboard.c \ |
| 1045 | $(CONFIG_H) \ | 1044 | $(CONFIG_H) \ |
| 1046 | $(EMACS_ROOT)/nt/inc/unistd.h \ | ||
| 1047 | $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ | 1045 | $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ |
| 1048 | $(EMACS_ROOT)/nt/inc/sys/time.h \ | 1046 | $(EMACS_ROOT)/nt/inc/sys/time.h \ |
| 1049 | $(LISP_H) \ | 1047 | $(LISP_H) \ |
| @@ -1104,8 +1102,6 @@ $(BLD)/lastfile.$(O) : \ | |||
| 1104 | $(BLD)/lread.$(O) : \ | 1102 | $(BLD)/lread.$(O) : \ |
| 1105 | $(SRC)/lread.c \ | 1103 | $(SRC)/lread.c \ |
| 1106 | $(CONFIG_H) \ | 1104 | $(CONFIG_H) \ |
| 1107 | $(EMACS_ROOT)/nt/inc/inttypes.h \ | ||
| 1108 | $(EMACS_ROOT)/nt/inc/stdint.h \ | ||
| 1109 | $(EMACS_ROOT)/nt/inc/unistd.h \ | 1105 | $(EMACS_ROOT)/nt/inc/unistd.h \ |
| 1110 | $(EMACS_ROOT)/nt/inc/sys/file.h \ | 1106 | $(EMACS_ROOT)/nt/inc/sys/file.h \ |
| 1111 | $(EMACS_ROOT)/nt/inc/sys/time.h \ | 1107 | $(EMACS_ROOT)/nt/inc/sys/time.h \ |
| @@ -1196,7 +1192,6 @@ $(BLD)/w32.$(O) : \ | |||
| 1196 | $(CONFIG_H) \ | 1192 | $(CONFIG_H) \ |
| 1197 | $(EMACS_ROOT)/nt/inc/grp.h \ | 1193 | $(EMACS_ROOT)/nt/inc/grp.h \ |
| 1198 | $(EMACS_ROOT)/nt/inc/pwd.h \ | 1194 | $(EMACS_ROOT)/nt/inc/pwd.h \ |
| 1199 | $(EMACS_ROOT)/nt/inc/unistd.h \ | ||
| 1200 | $(EMACS_ROOT)/nt/inc/sys/file.h \ | 1195 | $(EMACS_ROOT)/nt/inc/sys/file.h \ |
| 1201 | $(EMACS_ROOT)/nt/inc/sys/socket.h \ | 1196 | $(EMACS_ROOT)/nt/inc/sys/socket.h \ |
| 1202 | $(EMACS_ROOT)/nt/inc/sys/time.h \ | 1197 | $(EMACS_ROOT)/nt/inc/sys/time.h \ |
| @@ -1242,7 +1237,6 @@ $(BLD)/w32proc.$(O) : \ | |||
| 1242 | $(CONFIG_H) \ | 1237 | $(CONFIG_H) \ |
| 1243 | $(EMACS_ROOT)/nt/inc/langinfo.h \ | 1238 | $(EMACS_ROOT)/nt/inc/langinfo.h \ |
| 1244 | $(EMACS_ROOT)/nt/inc/nl_types.h \ | 1239 | $(EMACS_ROOT)/nt/inc/nl_types.h \ |
| 1245 | $(EMACS_ROOT)/nt/inc/unistd.h \ | ||
| 1246 | $(EMACS_ROOT)/nt/inc/sys/file.h \ | 1240 | $(EMACS_ROOT)/nt/inc/sys/file.h \ |
| 1247 | $(EMACS_ROOT)/nt/inc/sys/time.h \ | 1241 | $(EMACS_ROOT)/nt/inc/sys/time.h \ |
| 1248 | $(LISP_H) \ | 1242 | $(LISP_H) \ |
| @@ -1277,7 +1271,6 @@ $(BLD)/w32console.$(O) : \ | |||
| 1277 | $(BLD)/print.$(O) : \ | 1271 | $(BLD)/print.$(O) : \ |
| 1278 | $(SRC)/print.c \ | 1272 | $(SRC)/print.c \ |
| 1279 | $(CONFIG_H) \ | 1273 | $(CONFIG_H) \ |
| 1280 | $(EMACS_ROOT)/nt/inc/unistd.h \ | ||
| 1281 | $(EMACS_ROOT)/nt/inc/sys/time.h \ | 1274 | $(EMACS_ROOT)/nt/inc/sys/time.h \ |
| 1282 | $(EMACS_ROOT)/lib/ftoastr.h \ | 1275 | $(EMACS_ROOT)/lib/ftoastr.h \ |
| 1283 | $(EMACS_ROOT)/lib/intprops.h \ | 1276 | $(EMACS_ROOT)/lib/intprops.h \ |
| @@ -1305,10 +1298,7 @@ $(BLD)/print.$(O) : \ | |||
| 1305 | $(BLD)/process.$(O) : \ | 1298 | $(BLD)/process.$(O) : \ |
| 1306 | $(SRC)/process.c \ | 1299 | $(SRC)/process.c \ |
| 1307 | $(CONFIG_H) \ | 1300 | $(CONFIG_H) \ |
| 1308 | $(EMACS_ROOT)/nt/inc/inttypes.h \ | ||
| 1309 | $(EMACS_ROOT)/nt/inc/netdb.h \ | 1301 | $(EMACS_ROOT)/nt/inc/netdb.h \ |
| 1310 | $(EMACS_ROOT)/nt/inc/stdint.h \ | ||
| 1311 | $(EMACS_ROOT)/nt/inc/unistd.h \ | ||
| 1312 | $(EMACS_ROOT)/nt/inc/arpa/inet.h \ | 1302 | $(EMACS_ROOT)/nt/inc/arpa/inet.h \ |
| 1313 | $(EMACS_ROOT)/nt/inc/netinet/in.h \ | 1303 | $(EMACS_ROOT)/nt/inc/netinet/in.h \ |
| 1314 | $(EMACS_ROOT)/nt/inc/sys/file.h \ | 1304 | $(EMACS_ROOT)/nt/inc/sys/file.h \ |
| @@ -1437,7 +1427,6 @@ $(BLD)/sysdep.$(O) : \ | |||
| 1437 | $(EMACS_ROOT)/nt/inc/grp.h \ | 1427 | $(EMACS_ROOT)/nt/inc/grp.h \ |
| 1438 | $(EMACS_ROOT)/nt/inc/netdb.h \ | 1428 | $(EMACS_ROOT)/nt/inc/netdb.h \ |
| 1439 | $(EMACS_ROOT)/nt/inc/pwd.h \ | 1429 | $(EMACS_ROOT)/nt/inc/pwd.h \ |
| 1440 | $(EMACS_ROOT)/nt/inc/unistd.h \ | ||
| 1441 | $(EMACS_ROOT)/nt/inc/sys/file.h \ | 1430 | $(EMACS_ROOT)/nt/inc/sys/file.h \ |
| 1442 | $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ | 1431 | $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ |
| 1443 | $(EMACS_ROOT)/nt/inc/sys/socket.h \ | 1432 | $(EMACS_ROOT)/nt/inc/sys/socket.h \ |
| @@ -1582,7 +1571,6 @@ $(BLD)/window.$(O) : \ | |||
| 1582 | $(BLD)/xdisp.$(O) : \ | 1571 | $(BLD)/xdisp.$(O) : \ |
| 1583 | $(SRC)/xdisp.c \ | 1572 | $(SRC)/xdisp.c \ |
| 1584 | $(CONFIG_H) \ | 1573 | $(CONFIG_H) \ |
| 1585 | $(EMACS_ROOT)/nt/inc/unistd.h \ | ||
| 1586 | $(EMACS_ROOT)/nt/inc/sys/time.h \ | 1574 | $(EMACS_ROOT)/nt/inc/sys/time.h \ |
| 1587 | $(LISP_H) \ | 1575 | $(LISP_H) \ |
| 1588 | $(PROCESS_H) \ | 1576 | $(PROCESS_H) \ |
| @@ -1695,7 +1683,6 @@ $(BLD)/w32menu.$(O) : \ | |||
| 1695 | $(BLD)/w32term.$(O) : \ | 1683 | $(BLD)/w32term.$(O) : \ |
| 1696 | $(SRC)/w32term.c \ | 1684 | $(SRC)/w32term.c \ |
| 1697 | $(CONFIG_H) \ | 1685 | $(CONFIG_H) \ |
| 1698 | $(EMACS_ROOT)/nt/inc/unistd.h \ | ||
| 1699 | $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ | 1686 | $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ |
| 1700 | $(EMACS_ROOT)/nt/inc/sys/time.h \ | 1687 | $(EMACS_ROOT)/nt/inc/sys/time.h \ |
| 1701 | $(LISP_H) \ | 1688 | $(LISP_H) \ |