aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2012-12-08 11:57:43 +0200
committerEli Zaretskii2012-12-08 11:57:43 +0200
commit63999a7dbed8d493e2efc3411c2403483d8d71bf (patch)
tree3e9953659e3c9ae0cf1ee92b9a2f5b710fe3dbcd
parent7be78020e3baaa73d047af75675ea6c92c1c1fda (diff)
downloademacs-63999a7dbed8d493e2efc3411c2403483d8d71bf.tar.gz
emacs-63999a7dbed8d493e2efc3411c2403483d8d71bf.zip
Windows followup to 2012-12-08T02:30:51Z!eggert@cs.ucla.edu.
lib/makefile.w32-in ($(BLD)/sig2str.$(O)): New dependency. Remove a stray character at the beginning of the file. Fixes: debbugs:13026
-rw-r--r--ChangeLog6
-rw-r--r--lib/makefile.w32-in9
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 @@
12012-12-08 Eli Zaretskii <eliz@gnu.org>
2
3 * lib/makefile.w32-in ($(BLD)/sig2str.$(O)): New dependency.
4 Remove a stray character at the beginning of the file.
5 (Bug#13026)
6
12012-12-08 Paul Eggert <eggert@cs.ucla.edu> 72012-12-08 Paul Eggert <eggert@cs.ucla.edu>
2 8
3 Simplify get_lim_data. 9 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 @@
12# -*- Makefile -*- for GNU Emacs on the Microsoft Windows API. 1# -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
2# Copyright (C) 2011-2012 Free Software Foundation, Inc. 2# Copyright (C) 2011-2012 Free Software Foundation, Inc.
3 3
4# This file is part of GNU Emacs. 4# This file is part of GNU Emacs.
@@ -240,6 +240,13 @@ $(BLD)/filemode.$(O) : \
240 $(CONFIG_H) \ 240 $(CONFIG_H) \
241 $(FILEMODE_H) 241 $(FILEMODE_H)
242 242
243$(BLD)/sig2str.$(O) : \
244 $(GNU_LIB)/sig2str.c \
245 $(CONFIG_H) \
246 $(GNU_LIB)/sig2str.h \
247 $(GNU_LIB)/intprops.h
248
249
243# The following dependencies are for supporting parallel builds, where 250# The following dependencies are for supporting parallel builds, where
244# we must make sure $(BLD) exists before any compilation starts. 251# we must make sure $(BLD) exists before any compilation starts.
245# 252#