Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

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

diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index 2f6cb3f52a919c12138dcee88bd8f7b2a9e23eb8..d5128cc9a618422aa5b71f5b0c4d6bc8772e3db2 100644 (file)
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -26,9 +26,11 @@ LIBS                 =
 GNULIBOBJS = $(BLD)/c-ctype.$(O) \
             $(BLD)/c-strcasecmp.$(O) \
             $(BLD)/c-strncasecmp.$(O) \
+            $(BLD)/close-stream.$(O) \
             $(BLD)/dtoastr.$(O) \
             $(BLD)/dtotimespec.$(O)  \
             $(BLD)/execinfo.$(O)  \
+            $(BLD)/fpending.$(O)  \
             $(BLD)/getopt.$(O)  \
             $(BLD)/getopt1.$(O) \
             $(BLD)/gettime.$(O) \
@@ -40,6 +42,7 @@ GNULIBOBJS = $(BLD)/c-ctype.$(O) \
             $(BLD)/sha1.$(O) \
             $(BLD)/sha256.$(O) \
             $(BLD)/sha512.$(O) \
+            $(BLD)/sig2str.$(O) \
             $(BLD)/stat-time.$(O) \
             $(BLD)/timespec.$(O) \
             $(BLD)/u64.$(O) \
@@ -100,6 +103,8 @@ U64_H          = $(GNU_LIB)/u64.h \
                 $(NT_INC)/stdint.h
 SHA512_H       = $(GNU_LIB)/sha512.h \
                 $(U64_H)
+SIG2STR_H      = $(GNU_LIB)/sig2str.h \
+                $(GNU_LIB)/intprops.h
 STAT_TIME_H    = $(GNU_LIB)/stat-time.h \
                 $(NT_INC)/sys/stat.h
 
@@ -120,6 +125,13 @@ $(BLD)/c-strncasecmp.$(O) : \
        $(CONFIG_H) \
        $(C_CTYPE_H)
 
+$(BLD)/close-stream.$(O) : \
+       $(GNU_LIB)/close-stream.c \
+       $(GNU_LIB)/close-stream.h \
+       $(GNU_LIB)/fpending.h \
+       $(NT_INC)/stdbool.h \
+       $(CONFIG_H)
+
 $(BLD)/dtoastr.$(O) : \
        $(GNU_LIB)/dtoastr.c \
        $(FTOASTR_C)
@@ -135,6 +147,11 @@ $(BLD)/execinfo.$(O) : \
        $(GNU_LIB)/execinfo.h \
        $(CONFIG_H)
 
+$(BLD)/fpending.$(O) : \
+       $(GNU_LIB)/fpending.c \
+       $(GNU_LIB)/fpending.h \
+       $(CONFIG_H)
+
 $(BLD)/getopt.$(O) : \
        $(GNU_LIB)/getopt.c \
        $(GNU_LIB)/getopt.h \
@@ -225,6 +242,12 @@ $(BLD)/filemode.$(O) : \
        $(CONFIG_H) \
        $(FILEMODE_H)
 
+$(BLD)/sig2str.$(O) : \
+       $(GNU_LIB)/sig2str.c \
+       $(CONFIG_H) \
+       $(SIG2STR_H)
+
+
 # The following dependencies are for supporting parallel builds, where
 # we must make sure $(BLD) exists before any compilation starts.
 #
@@ -308,4 +331,3 @@ getopt_h:
 
 execinfo.h: execinfo.in.h
        $(CP) execinfo.in.h $@
-