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 c69e2d666d108e29750d8b93c57394e24f8793f2..76aae066a856ec32eb2e2aad0e5ac8c2bb5124e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-03  Eli Zaretskii  <eliz@gnu.org>
+
+       * 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  <eggert@cs.ucla.edu>
 
        Merge from gnulib, incorporating:

diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index db451d542a8c7ed229892bb042c45c60bc1751d3..af45b2685bd2fc4840c72caad5605601bfc7153c 100644 (file)
--- 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) \