Fix regression introduced by July 10 filelock.c patch.

[gnu-emacs] / lib / makefile.w32-in

diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index 345520798eb9cdaf1716b60c59ec49ef4d2ff130..2f6cb3f52a919c12138dcee88bd8f7b2a9e23eb8 100644 (file)
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -1,5 +1,5 @@
 # -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -28,6 +28,7 @@ GNULIBOBJS = $(BLD)/c-ctype.$(O) \
             $(BLD)/c-strncasecmp.$(O) \
             $(BLD)/dtoastr.$(O) \
             $(BLD)/dtotimespec.$(O)  \
+            $(BLD)/execinfo.$(O)  \
             $(BLD)/getopt.$(O)  \
             $(BLD)/getopt1.$(O) \
             $(BLD)/gettime.$(O) \
@@ -39,6 +40,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)
 
 #
@@ -71,18 +75,19 @@ NT_INC              = $(EMACS_ROOT)/nt/inc
 
 C_CTYPE_H      = $(GNU_LIB)/c-ctype.h \
                 $(NT_INC)/stdbool.h
-MS_W32_H       = $(SRC)/s/ms-w32.h \
+MS_W32_H       = $(NT_INC)/ms-w32.h \
                 $(NT_INC)/sys/stat.h
-CONFIG_H       = $(SRC)/config.h \
+CONF_POST_H    = $(SRC)/conf_post.h \
                 $(MS_W32_H)
+CONFIG_H       = $(SRC)/config.h \
+                $(CONF_POST_H)
 FILEMODE_H     = $(GNU_LIB)/filemode.h \
                 $(NT_INC)/sys/stat.h
 FTOASTR_H      = $(GNU_LIB)/ftoastr.h \
                 $(GNU_LIB)/intprops.h
 FTOASTR_C      = $(GNU_LIB)/ftoastr.c \
                 $(CONFIG_H) \
-                $(FTOASTR_H) \
-                $(GNU_LIB)/ftoastr.h
+                $(FTOASTR_H)
 GETOPT_INT_H   = $(GNU_LIB)/getopt_int.h \
                 $(GNU_LIB)/getopt.h
 MD5_H          = $(GNU_LIB)/md5.h \
@@ -94,8 +99,9 @@ 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)
+STAT_TIME_H    = $(GNU_LIB)/stat-time.h \
+                $(NT_INC)/sys/stat.h
 
 $(BLD)/c-ctype.$(O) : \
        $(GNU_LIB)/c-ctype.c \
@@ -124,6 +130,11 @@ $(BLD)/dtotimespec.$(O) : \
        $(GNU_LIB)/timespec.h \
        $(CONFIG_H)
 
+$(BLD)/execinfo.$(O) : \
+       $(GNU_LIB)/execinfo.c \
+       $(GNU_LIB)/execinfo.h \
+       $(CONFIG_H)
+
 $(BLD)/getopt.$(O) : \
        $(GNU_LIB)/getopt.c \
        $(GNU_LIB)/getopt.h \
@@ -194,6 +205,21 @@ $(BLD)/sha512.$(O) : \
        $(CONFIG_H) \
        $(SHA512_H)
 
+$(BLD)/stat-time.$(O) : \
+       $(GNU_LIB)/stat-time.c \
+       $(CONFIG_H) \
+       $(STAT_TIME_H)
+
+$(BLD)/timespec.$(O) : \
+       $(GNU_LIB)/timespec.c \
+       $(GNU_LIB)/timespec.h \
+       $(CONFIG_H)
+
+$(BLD)/u64.$(O) : \
+       $(GNU_LIB)/u64.c \
+       $(CONFIG_H) \
+       $(U64_H)
+
 $(BLD)/filemode.$(O) : \
        $(GNU_LIB)/filemode.c \
        $(CONFIG_H) \
@@ -279,3 +305,7 @@ getopt_h:
              < getopt.in.h > getopt_.h-t
        $(CP) getopt_.h-t getopt_.h
        - $(DEL) getopt_.h-t
+
+execinfo.h: execinfo.in.h
+       $(CP) execinfo.in.h $@
+