aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2012-12-11 03:06:53 +0100
committerJuanma Barranquero2012-12-11 03:06:53 +0100
commit0eeb69fe150751f33150f448fcc4fcd1d3fe4ff9 (patch)
tree7ecf41cb98738cf0351b77fbd2740ab858d2932d
parentabf8abe58fab8069a1cf950f055b80aa3ce46e0f (diff)
downloademacs-0eeb69fe150751f33150f448fcc4fcd1d3fe4ff9.tar.gz
emacs-0eeb69fe150751f33150f448fcc4fcd1d3fe4ff9.zip
(lib-src,src,lib)/makefile.w32-in: Update dependencies.
-rw-r--r--ChangeLog5
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lib-src/makefile.w32-in1
-rw-r--r--lib/makefile.w32-in5
-rw-r--r--src/ChangeLog6
-rw-r--r--src/makefile.w32-in7
6 files changed, 26 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2bb7eab468e..05bc063624b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12012-12-11 Juanma Barranquero <lekktu@gmail.com>
2
3 * lib/makefile.w32-in (SIG2STR_H): New macro.
4 ($(BLD)/sig2str.$(O)): Update dependencies.
5
12012-12-10 Paul Eggert <eggert@cs.ucla.edu> 62012-12-10 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * configure.ac (HAVE_INOTIFY): Speed up configure-time test. 8 * configure.ac (HAVE_INOTIFY): Speed up configure-time test.
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 58fec00da41..866e76ad24f 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
12012-12-11 Juanma Barranquero <lekktu@gmail.com>
2
3 * makefile.w32-in (SYSWAIT_H): Update dependencies.
4
12012-12-10 Eli Zaretskii <eliz@gnu.org> 52012-12-10 Eli Zaretskii <eliz@gnu.org>
2 6
3 * makefile.w32-in (obj): Add w32notify.o. Add missing X and Unix 7 * makefile.w32-in (obj): Add w32notify.o. Add missing X and Unix
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 2d4270b0e96..24be44e22f2 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -378,6 +378,7 @@ SYSTIME_H = $(SRC)/systime.h \
378 $(NT_INC)/sys/time.h \ 378 $(NT_INC)/sys/time.h \
379 $(GNU_LIB)/timespec.h 379 $(GNU_LIB)/timespec.h
380SYSWAIT_H = $(SRC)/syswait.h \ 380SYSWAIT_H = $(SRC)/syswait.h \
381 $(NT_INC)/stdbool.h \
381 $(NT_INC)/sys/wait.h 382 $(NT_INC)/sys/wait.h
382 383
383$(BLD)/ctags.$(O) : \ 384$(BLD)/ctags.$(O) : \
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index b27e21032b3..1482d686acb 100644
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -103,6 +103,8 @@ U64_H = $(GNU_LIB)/u64.h \
103 $(NT_INC)/stdint.h 103 $(NT_INC)/stdint.h
104SHA512_H = $(GNU_LIB)/sha512.h \ 104SHA512_H = $(GNU_LIB)/sha512.h \
105 $(U64_H) 105 $(U64_H)
106SIG2STR_H = $(GNU_LIB)/sig2str.h \
107 $(GNU_LIB)/intprops.h
106STAT_TIME_H = $(GNU_LIB)/stat-time.h \ 108STAT_TIME_H = $(GNU_LIB)/stat-time.h \
107 $(NT_INC)/sys/stat.h 109 $(NT_INC)/sys/stat.h
108 110
@@ -243,8 +245,7 @@ $(BLD)/filemode.$(O) : \
243$(BLD)/sig2str.$(O) : \ 245$(BLD)/sig2str.$(O) : \
244 $(GNU_LIB)/sig2str.c \ 246 $(GNU_LIB)/sig2str.c \
245 $(CONFIG_H) \ 247 $(CONFIG_H) \
246 $(GNU_LIB)/sig2str.h \ 248 $(SIG2STR_H)
247 $(GNU_LIB)/intprops.h
248 249
249 250
250# The following dependencies are for supporting parallel builds, where 251# The following dependencies are for supporting parallel builds, where
diff --git a/src/ChangeLog b/src/ChangeLog
index 96e7f152725..0474cf67e16 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12012-12-11 Juanma Barranquero <lekktu@gmail.com>
2
3 * makefile.w32-in (SIG2STR_H): New macro.
4 (SYSWAIT_H, $(BLD)/emacs.$(O), $(BLD)/process.$(O))
5 ($(BLD)/w32notify.$(O)): Update dependencies.
6
12012-12-10 Daniel Colascione <dancol@dancol.org> 72012-12-10 Daniel Colascione <dancol@dancol.org>
2 8
3 * w32term.c, keyboard.c: Fix build break in cygw32 by omitting 9 * w32term.c, keyboard.c: Fix build break in cygw32 by omitting
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 388c097a066..facf79cf849 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -462,6 +462,8 @@ U64_H = $(GNU_LIB)/u64.h \
462 $(NT_INC)/stdint.h 462 $(NT_INC)/stdint.h
463SHA512_H = $(GNU_LIB)/sha512.h \ 463SHA512_H = $(GNU_LIB)/sha512.h \
464 $(U64_H) 464 $(U64_H)
465SIG2STR_H = $(GNU_LIB)/sig2str.h \
466 $(GNU_LIB)/intprops.h
465SOCKET_H = $(NT_INC)/sys/socket.h \ 467SOCKET_H = $(NT_INC)/sys/socket.h \
466 $(SRC)/w32.h 468 $(SRC)/w32.h
467STAT_TIME_H = $(GNU_LIB)/stat-time.h \ 469STAT_TIME_H = $(GNU_LIB)/stat-time.h \
@@ -472,6 +474,7 @@ SYSTTY_H = $(SRC)/systty.h \
472 $(NT_INC)/sys/ioctl.h \ 474 $(NT_INC)/sys/ioctl.h \
473 $(NT_INC)/unistd.h 475 $(NT_INC)/unistd.h
474SYSWAIT_H = $(SRC)/syswait.h \ 476SYSWAIT_H = $(SRC)/syswait.h \
477 $(NT_INC)/stdbool.h \
475 $(NT_INC)/sys/wait.h 478 $(NT_INC)/sys/wait.h
476TERMHOOKS_H = $(SRC)/termhooks.h \ 479TERMHOOKS_H = $(SRC)/termhooks.h \
477 $(SYSTIME_H) 480 $(SYSTIME_H)
@@ -800,6 +803,7 @@ $(BLD)/emacs.$(O) : \
800 $(SRC)/keymap.h \ 803 $(SRC)/keymap.h \
801 $(SRC)/unexec.h \ 804 $(SRC)/unexec.h \
802 $(SRC)/w32.h \ 805 $(SRC)/w32.h \
806 $(SRC)/w32common.h \
803 $(SRC)/w32heap.h \ 807 $(SRC)/w32heap.h \
804 $(SRC)/w32select.h \ 808 $(SRC)/w32select.h \
805 $(NT_INC)/sys/file.h \ 809 $(NT_INC)/sys/file.h \
@@ -1288,11 +1292,13 @@ $(BLD)/process.$(O) : \
1288 $(CHARACTER_H) \ 1292 $(CHARACTER_H) \
1289 $(CODING_H) \ 1293 $(CODING_H) \
1290 $(CONFIG_H) \ 1294 $(CONFIG_H) \
1295 $(C_CTYPE_H) \
1291 $(DISPEXTERN_H) \ 1296 $(DISPEXTERN_H) \
1292 $(FRAME_H) \ 1297 $(FRAME_H) \
1293 $(KEYBOARD_H) \ 1298 $(KEYBOARD_H) \
1294 $(LISP_H) \ 1299 $(LISP_H) \
1295 $(PROCESS_H) \ 1300 $(PROCESS_H) \
1301 $(SIG2STR_H) \
1296 $(SOCKET_H) \ 1302 $(SOCKET_H) \
1297 $(SYSSIGNAL_H) \ 1303 $(SYSSIGNAL_H) \
1298 $(SYSTIME_H) \ 1304 $(SYSTIME_H) \
@@ -1696,6 +1702,7 @@ $(BLD)/w32uniscribe.$(O) : \
1696 1702
1697$(BLD)/w32notify.$(O) : \ 1703$(BLD)/w32notify.$(O) : \
1698 $(SRC)/w32notify.c \ 1704 $(SRC)/w32notify.c \
1705 $(SRC)/w32.h \
1699 $(SRC)/w32common.h \ 1706 $(SRC)/w32common.h \
1700 $(CODING_H) \ 1707 $(CODING_H) \
1701 $(CONFIG_H) \ 1708 $(CONFIG_H) \