From: Juanma Barranquero Date: Sun, 24 Jun 2012 17:57:06 +0000 (+0200) Subject: src/makefile.w32-in: Update dependencies. X-Git-Tag: emacs-24.2.90~1199^2~364 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7583a3a10ac038edd25f9ed6ec321c85e62e75b6;p=emacs.git src/makefile.w32-in: Update dependencies. --- diff --git a/src/ChangeLog b/src/ChangeLog index 9b383b5243c..a6efff1a329 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-06-24 Juanma Barranquero + + * makefile.w32-in: Update dependencies. + 2012-06-24 Eli Zaretskii * 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 = .. GNU_LIB = $(EMACS_ROOT)/lib NT_INC = $(EMACS_ROOT)/nt/inc -TIMESPEC_H = $(GNU_LIB)/timespec.h SYSTIME_H = $(SRC)/systime.h \ - $(TIMESPEC_H) \ - $(NT_INC)/sys/time.h + $(NT_INC)/sys/time.h \ + $(GNU_LIB)/timespec.h ATIMER_H = $(SRC)/atimer.h \ $(SYSTIME_H) BLOCKINPUT_H = $(SRC)/blockinput.h \ @@ -461,15 +460,12 @@ SHA512_H = $(GNU_LIB)/sha512.h \ SOCKET_H = $(NT_INC)/sys/socket.h \ $(SRC)/w32.h STAT_TIME_H = $(GNU_LIB)/stat-time.h \ - $(NT_INC)/sys/stat.h \ - $(NT_INC)/sys/time.h + $(NT_INC)/sys/stat.h SYSTTY_H = $(SRC)/systty.h \ $(NT_INC)/sys/ioctl.h \ $(NT_INC)/unistd.h TERMHOOKS_H = $(SRC)/termhooks.h \ $(SYSTIME_H) -UTIMENS_H = $(GNU_LIB)/utimens.h \ - $(NT_INC)/sys/time.h W32TERM_H = $(SRC)/w32term.h \ $(W32GUI_H) WINDOW_H = $(SRC)/window.h \ @@ -1353,6 +1349,7 @@ $(BLD)/sysdep.$(O) : \ $(NT_INC)/unistd.h \ $(GNU_LIB)/allocator.h \ $(GNU_LIB)/ignore-value.h \ + $(GNU_LIB)/utimens.h \ $(BLOCKINPUT_H) \ $(CAREADLINKAT_H) \ $(CONFIG_H) \ @@ -1366,7 +1363,6 @@ $(BLD)/sysdep.$(O) : \ $(SYSTIME_H) \ $(SYSTTY_H) \ $(TERMHOOKS_H) \ - $(UTIMENS_H) \ $(WINDOW_H) $(BLD)/term.$(O) : \