aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2012-11-18 00:16:24 +0100
committerJuanma Barranquero2012-11-18 00:16:24 +0100
commita75ce9d3fd54377fa67bdfb94f46dbe1f1e59450 (patch)
treee4c6de62927192338a29dd12076f2f9c9bc3606b
parent49cdacdad393e2b9282a19a963030dfbe1a738ab (diff)
downloademacs-a75ce9d3fd54377fa67bdfb94f46dbe1f1e59450.tar.gz
emacs-a75ce9d3fd54377fa67bdfb94f46dbe1f1e59450.zip
lib-src/makefile.w32-in, src/makefile.w32-in: Update dependencies.
* lib-src/makefile.w32-in (SYSWAIT_H): New macro. ($(BLD)/movemail.$(O)): Update dependencies. * src/makefile.w32-in (SYSWAIT_H): New macro. ($(BLD)/callproc.$(O), $(BLD)/w32proc.$(O), $(BLD)/process.$(O)) ($(BLD)/sysdep.$(O)): Update dependencies.
-rw-r--r--lib-src/ChangeLog5
-rw-r--r--lib-src/makefile.w32-in6
-rw-r--r--src/ChangeLog6
-rw-r--r--src/makefile.w32-in10
4 files changed, 21 insertions, 6 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 599e005b4e0..926297b6dd3 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
12012-11-17 Juanma Barranquero <lekktu@gmail.com>
2
3 * makefile.w32-in (SYSWAIT_H): New macro.
4 ($(BLD)/movemail.$(O)): Update dependencies.
5
12012-11-17 Paul Eggert <eggert@cs.ucla.edu> 62012-11-17 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Assume POSIX 1003.1-1988 or later for fcntl.h (Bug#12881). 8 Assume POSIX 1003.1-1988 or later for fcntl.h (Bug#12881).
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index f3ab4421fd3..cbd29f32cfe 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -374,6 +374,8 @@ NTLIB_H = $(LIB_SRC)/ntlib.h \
374SYSTIME_H = $(SRC)/systime.h \ 374SYSTIME_H = $(SRC)/systime.h \
375 $(NT_INC)/sys/time.h \ 375 $(NT_INC)/sys/time.h \
376 $(GNU_LIB)/timespec.h 376 $(GNU_LIB)/timespec.h
377SYSWAIT_H = $(SRC)/syswait.h \
378 $(NT_INC)/sys/wait.h
377 379
378$(BLD)/ctags.$(O) : \ 380$(BLD)/ctags.$(O) : \
379 $(LIB_SRC)/ctags.c \ 381 $(LIB_SRC)/ctags.c \
@@ -419,14 +421,14 @@ $(BLD)/make-docfile.$(O) : \
419$(BLD)/movemail.$(O) : \ 421$(BLD)/movemail.$(O) : \
420 $(LIB_SRC)/movemail.c \ 422 $(LIB_SRC)/movemail.c \
421 $(LIB_SRC)/pop.h \ 423 $(LIB_SRC)/pop.h \
422 $(SRC)/syswait.h \
423 $(NT_INC)/pwd.h \ 424 $(NT_INC)/pwd.h \
424 $(NT_INC)/sys/file.h \ 425 $(NT_INC)/sys/file.h \
425 $(NT_INC)/sys/stat.h \ 426 $(NT_INC)/sys/stat.h \
426 $(NT_INC)/unistd.h \ 427 $(NT_INC)/unistd.h \
427 $(GNU_LIB)/getopt.h \ 428 $(GNU_LIB)/getopt.h \
428 $(CONFIG_H) \ 429 $(CONFIG_H) \
429 $(NTLIB_H) 430 $(NTLIB_H) \
431 $(SYSWAIT_H)
430 432
431$(BLD)/ntlib.$(O) : \ 433$(BLD)/ntlib.$(O) : \
432 $(LIB_SRC)/ntlib.c \ 434 $(LIB_SRC)/ntlib.c \
diff --git a/src/ChangeLog b/src/ChangeLog
index a847a3913dd..c7fb6170d27 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12012-11-17 Juanma Barranquero <lekktu@gmail.com>
2
3 * makefile.w32-in (SYSWAIT_H): New macro.
4 ($(BLD)/callproc.$(O), $(BLD)/w32proc.$(O), $(BLD)/process.$(O))
5 ($(BLD)/sysdep.$(O)): Update dependencies.
6
12012-11-17 Paul Eggert <eggert@cs.ucla.edu> 72012-11-17 Paul Eggert <eggert@cs.ucla.edu>
2 8
3 Assume POSIX 1003.1-1988 or later for fcntl.h (Bug#12881). 9 Assume POSIX 1003.1-1988 or later for fcntl.h (Bug#12881).
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 69fd6857f86..9778e955677 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -472,6 +472,8 @@ SYSSIGNAL_H = $(SRC)/syssignal.h \
472SYSTTY_H = $(SRC)/systty.h \ 472SYSTTY_H = $(SRC)/systty.h \
473 $(NT_INC)/sys/ioctl.h \ 473 $(NT_INC)/sys/ioctl.h \
474 $(NT_INC)/unistd.h 474 $(NT_INC)/unistd.h
475SYSWAIT_H = $(SRC)/syswait.h \
476 $(NT_INC)/sys/wait.h
475TERMHOOKS_H = $(SRC)/termhooks.h \ 477TERMHOOKS_H = $(SRC)/termhooks.h \
476 $(SYSTIME_H) 478 $(SYSTIME_H)
477W32FONT_H = $(SRC)/w32font.h \ 479W32FONT_H = $(SRC)/w32font.h \
@@ -566,7 +568,6 @@ $(BLD)/callproc.$(O) : \
566 $(SRC)/commands.h \ 568 $(SRC)/commands.h \
567 $(SRC)/composite.h \ 569 $(SRC)/composite.h \
568 $(SRC)/epaths.h \ 570 $(SRC)/epaths.h \
569 $(SRC)/syswait.h \
570 $(SRC)/w32.h \ 571 $(SRC)/w32.h \
571 $(NT_INC)/sys/file.h \ 572 $(NT_INC)/sys/file.h \
572 $(NT_INC)/unistd.h \ 573 $(NT_INC)/unistd.h \
@@ -580,6 +581,7 @@ $(BLD)/callproc.$(O) : \
580 $(PROCESS_H) \ 581 $(PROCESS_H) \
581 $(SYSSIGNAL_H) \ 582 $(SYSSIGNAL_H) \
582 $(SYSTTY_H) \ 583 $(SYSTTY_H) \
584 $(SYSWAIT_H) \
583 $(TERMHOOKS_H) 585 $(TERMHOOKS_H)
584 586
585$(BLD)/casefiddle.$(O) : \ 587$(BLD)/casefiddle.$(O) : \
@@ -1216,7 +1218,6 @@ $(BLD)/w32inevt.$(O) : \
1216 1218
1217$(BLD)/w32proc.$(O) : \ 1219$(BLD)/w32proc.$(O) : \
1218 $(SRC)/w32proc.c \ 1220 $(SRC)/w32proc.c \
1219 $(SRC)/syswait.h \
1220 $(SRC)/w32.h \ 1221 $(SRC)/w32.h \
1221 $(SRC)/w32common.h \ 1222 $(SRC)/w32common.h \
1222 $(SRC)/w32heap.h \ 1223 $(SRC)/w32heap.h \
@@ -1230,6 +1231,7 @@ $(BLD)/w32proc.$(O) : \
1230 $(PROCESS_H) \ 1231 $(PROCESS_H) \
1231 $(SYSSIGNAL_H) \ 1232 $(SYSSIGNAL_H) \
1232 $(SYSTIME_H) \ 1233 $(SYSTIME_H) \
1234 $(SYSWAIT_H) \
1233 $(W32TERM_H) 1235 $(W32TERM_H)
1234 1236
1235$(BLD)/w32console.$(O) : \ 1237$(BLD)/w32console.$(O) : \
@@ -1274,7 +1276,6 @@ $(BLD)/process.$(O) : \
1274 $(SRC)/composite.h \ 1276 $(SRC)/composite.h \
1275 $(SRC)/gnutls.h \ 1277 $(SRC)/gnutls.h \
1276 $(SRC)/sysselect.h \ 1278 $(SRC)/sysselect.h \
1277 $(SRC)/syswait.h \
1278 $(SRC)/termopts.h \ 1279 $(SRC)/termopts.h \
1279 $(NT_INC)/arpa/inet.h \ 1280 $(NT_INC)/arpa/inet.h \
1280 $(NT_INC)/netdb.h \ 1281 $(NT_INC)/netdb.h \
@@ -1297,6 +1298,7 @@ $(BLD)/process.$(O) : \
1297 $(SYSSIGNAL_H) \ 1298 $(SYSSIGNAL_H) \
1298 $(SYSTIME_H) \ 1299 $(SYSTIME_H) \
1299 $(SYSTTY_H) \ 1300 $(SYSTTY_H) \
1301 $(SYSWAIT_H) \
1300 $(TERMHOOKS_H) \ 1302 $(TERMHOOKS_H) \
1301 $(W32TERM_H) \ 1303 $(W32TERM_H) \
1302 $(WINDOW_H) 1304 $(WINDOW_H)
@@ -1380,7 +1382,6 @@ $(BLD)/sysdep.$(O) : \
1380 $(SRC)/blockinput.h \ 1382 $(SRC)/blockinput.h \
1381 $(SRC)/cm.h \ 1383 $(SRC)/cm.h \
1382 $(SRC)/sysselect.h \ 1384 $(SRC)/sysselect.h \
1383 $(SRC)/syswait.h \
1384 $(SRC)/termchar.h \ 1385 $(SRC)/termchar.h \
1385 $(SRC)/termopts.h \ 1386 $(SRC)/termopts.h \
1386 $(NT_INC)/netdb.h \ 1387 $(NT_INC)/netdb.h \
@@ -1405,6 +1406,7 @@ $(BLD)/sysdep.$(O) : \
1405 $(SYSSIGNAL_H) \ 1406 $(SYSSIGNAL_H) \
1406 $(SYSTIME_H) \ 1407 $(SYSTIME_H) \
1407 $(SYSTTY_H) \ 1408 $(SYSTTY_H) \
1409 $(SYSWAIT_H) \
1408 $(TERMHOOKS_H) \ 1410 $(TERMHOOKS_H) \
1409 $(WINDOW_H) 1411 $(WINDOW_H)
1410 1412