aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2012-06-24 19:57:06 +0200
committerJuanma Barranquero2012-06-24 19:57:06 +0200
commit7583a3a10ac038edd25f9ed6ec321c85e62e75b6 (patch)
treed538e935361a563552ab6bfe22cd9e5f7cc1359b /src
parent845ca893904e4664063cb5c121b34925386849f7 (diff)
downloademacs-7583a3a10ac038edd25f9ed6ec321c85e62e75b6.tar.gz
emacs-7583a3a10ac038edd25f9ed6ec321c85e62e75b6.zip
src/makefile.w32-in: Update dependencies.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/makefile.w32-in12
2 files changed, 8 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9b383b5243c..a6efff1a329 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-06-24 Juanma Barranquero <lekktu@gmail.com>
2
3 * makefile.w32-in: Update dependencies.
4
12012-06-24 Eli Zaretskii <eliz@gnu.org> 52012-06-24 Eli Zaretskii <eliz@gnu.org>
2 6
3 * makefile.w32-in (TIMESPEC_H): Remove nt/inc/sys/time.h. 7 * makefile.w32-in (TIMESPEC_H): Remove nt/inc/sys/time.h.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index ef20356fdeb..01f8a1a4ac5 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -390,10 +390,9 @@ EMACS_ROOT = ..
390GNU_LIB = $(EMACS_ROOT)/lib 390GNU_LIB = $(EMACS_ROOT)/lib
391NT_INC = $(EMACS_ROOT)/nt/inc 391NT_INC = $(EMACS_ROOT)/nt/inc
392 392
393TIMESPEC_H = $(GNU_LIB)/timespec.h
394SYSTIME_H = $(SRC)/systime.h \ 393SYSTIME_H = $(SRC)/systime.h \
395 $(TIMESPEC_H) \ 394 $(NT_INC)/sys/time.h \
396 $(NT_INC)/sys/time.h 395 $(GNU_LIB)/timespec.h
397ATIMER_H = $(SRC)/atimer.h \ 396ATIMER_H = $(SRC)/atimer.h \
398 $(SYSTIME_H) 397 $(SYSTIME_H)
399BLOCKINPUT_H = $(SRC)/blockinput.h \ 398BLOCKINPUT_H = $(SRC)/blockinput.h \
@@ -461,15 +460,12 @@ SHA512_H = $(GNU_LIB)/sha512.h \
461SOCKET_H = $(NT_INC)/sys/socket.h \ 460SOCKET_H = $(NT_INC)/sys/socket.h \
462 $(SRC)/w32.h 461 $(SRC)/w32.h
463STAT_TIME_H = $(GNU_LIB)/stat-time.h \ 462STAT_TIME_H = $(GNU_LIB)/stat-time.h \
464 $(NT_INC)/sys/stat.h \ 463 $(NT_INC)/sys/stat.h
465 $(NT_INC)/sys/time.h
466SYSTTY_H = $(SRC)/systty.h \ 464SYSTTY_H = $(SRC)/systty.h \
467 $(NT_INC)/sys/ioctl.h \ 465 $(NT_INC)/sys/ioctl.h \
468 $(NT_INC)/unistd.h 466 $(NT_INC)/unistd.h
469TERMHOOKS_H = $(SRC)/termhooks.h \ 467TERMHOOKS_H = $(SRC)/termhooks.h \
470 $(SYSTIME_H) 468 $(SYSTIME_H)
471UTIMENS_H = $(GNU_LIB)/utimens.h \
472 $(NT_INC)/sys/time.h
473W32TERM_H = $(SRC)/w32term.h \ 469W32TERM_H = $(SRC)/w32term.h \
474 $(W32GUI_H) 470 $(W32GUI_H)
475WINDOW_H = $(SRC)/window.h \ 471WINDOW_H = $(SRC)/window.h \
@@ -1353,6 +1349,7 @@ $(BLD)/sysdep.$(O) : \
1353 $(NT_INC)/unistd.h \ 1349 $(NT_INC)/unistd.h \
1354 $(GNU_LIB)/allocator.h \ 1350 $(GNU_LIB)/allocator.h \
1355 $(GNU_LIB)/ignore-value.h \ 1351 $(GNU_LIB)/ignore-value.h \
1352 $(GNU_LIB)/utimens.h \
1356 $(BLOCKINPUT_H) \ 1353 $(BLOCKINPUT_H) \
1357 $(CAREADLINKAT_H) \ 1354 $(CAREADLINKAT_H) \
1358 $(CONFIG_H) \ 1355 $(CONFIG_H) \
@@ -1366,7 +1363,6 @@ $(BLD)/sysdep.$(O) : \
1366 $(SYSTIME_H) \ 1363 $(SYSTIME_H) \
1367 $(SYSTTY_H) \ 1364 $(SYSTTY_H) \
1368 $(TERMHOOKS_H) \ 1365 $(TERMHOOKS_H) \
1369 $(UTIMENS_H) \
1370 $(WINDOW_H) 1366 $(WINDOW_H)
1371 1367
1372$(BLD)/term.$(O) : \ 1368$(BLD)/term.$(O) : \