From: Eli Zaretskii Date: Fri, 3 Aug 2012 10:02:48 +0000 (+0300) Subject: Adapt lib/makefile.w32-in to latest gnulib imports. X-Git-Tag: emacs-24.2.90~875 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fddc1855e20074786b238c4f9458bb7e72c612f4;p=emacs.git Adapt lib/makefile.w32-in to latest gnulib imports. lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/stat-time.$(O), $(BLD)/timespec.$(O), and $(BLD)/u64.$(O). (SHA512_H): Don't mention u64.h twice. ($(BLD)/stat-time.$(O), ($(BLD)/timespec.$(O), ($(BLD)/u64.$(O)): New targets. --- diff --git a/ChangeLog b/ChangeLog index c69e2d666d1..76aae066a85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-08-03 Eli Zaretskii + + * lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/stat-time.$(O), + $(BLD)/timespec.$(O), and $(BLD)/u64.$(O). + (SHA512_H): Don't mention u64.h twice. + ($(BLD)/stat-time.$(O), ($(BLD)/timespec.$(O), ($(BLD)/u64.$(O)): + New targets. + 2012-08-03 Paul Eggert Merge from gnulib, incorporating: diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in index db451d542a8..af45b2685bd 100644 --- a/lib/makefile.w32-in +++ b/lib/makefile.w32-in @@ -39,6 +39,9 @@ GNULIBOBJS = $(BLD)/c-ctype.$(O) \ $(BLD)/sha1.$(O) \ $(BLD)/sha256.$(O) \ $(BLD)/sha512.$(O) \ + $(BLD)/stat-time.$(O) \ + $(BLD)/timespec.$(O) \ + $(BLD)/u64.$(O) \ $(BLD)/filemode.$(O) # @@ -96,8 +99,7 @@ SHA256_H = $(GNU_LIB)/sha256.h \ U64_H = $(GNU_LIB)/u64.h \ $(NT_INC)/stdint.h SHA512_H = $(GNU_LIB)/sha512.h \ - $(U64_H) \ - $(GNU_LIB)/u64.h + $(U64_H) $(BLD)/c-ctype.$(O) : \ $(GNU_LIB)/c-ctype.c \ @@ -196,6 +198,19 @@ $(BLD)/sha512.$(O) : \ $(CONFIG_H) \ $(SHA512_H) +$(BLD)/stat-time.$(O) : \ + $(GNU_LIB)/stat-time.h \ + $(NT_INC)/sys/stat.h \ + $(CONFIG_H) + +$(BLD)/timespec.$(O) : \ + $(GNU_LIB)/timespec.h \ + $(CONFIG_H) + +$(BLD)/u64.$(O) : \ + $(U64_H) \ + $(CONFIG_H) + $(BLD)/filemode.$(O) : \ $(GNU_LIB)/filemode.c \ $(CONFIG_H) \