auto upstream

2 files changed, 14 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c0ab1e03b70..1d4fc853693 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * lib/makefile.w32-in ($(BLD)/sig2str.$(O)): New dependency.
+        Remove a stray character at the beginning of the file.
+        (Bug#13026)
+
 2012-12-08  Paul Eggert  <eggert@cs.ucla.edu>
 
         Simplify get_lim_data.
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index 348fe911a2a..b27e21032b3 100644
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -1,4 +1,4 @@
-2# -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
+# -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
 # Copyright (C) 2011-2012 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -240,6 +240,13 @@ $(BLD)/filemode.$(O) : \
         $(CONFIG_H) \
         $(FILEMODE_H)
 
+$(BLD)/sig2str.$(O) : \
+        $(GNU_LIB)/sig2str.c \
+        $(CONFIG_H) \
+        $(GNU_LIB)/sig2str.h \
+        $(GNU_LIB)/intprops.h
+
+
 # The following dependencies are for supporting parallel builds, where
 # we must make sure $(BLD) exists before any compilation starts.
 #