Fix handling of face attributes in Fx_create_frame (Bug#16529).

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

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 3484d6c70c824bcae86cbb190c7589e264d55e82..ab7f3056d339614384951181be5ef416a2489d48 100644 (file)
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -1,5 +1,5 @@
 # -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -41,7 +41,7 @@ TRES          = $(BLD)/emacs.res
 TLASTLIB       = $(BLD)/lastfile.$(A)
 GNULIB         = ../lib/$(BLD)/libgnu.$(A)
 
-DOC            = $(OBJDIR)/etc/DOC-X
+DOC            = $(OBJDIR)/etc/DOC
 
 FULL_LINK_FLAGS = $(LINK_FLAGS) $(TEMACS_EXTRA_LINK)
 
@@ -813,7 +813,6 @@ $(BLD)/emacs.$(O) : \
        $(NT_INC)/sys/file.h \
        $(NT_INC)/unistd.h \
        $(GNU_LIB)/close-stream.h \
-       $(GNU_LIB)/ignore-value.h \
        $(ATIMER_H) \
        $(BUFFER_H) \
        $(CHARACTER_H) \
@@ -1407,7 +1406,6 @@ $(BLD)/sysdep.$(O) : \
        $(NT_INC)/sys/stat.h \
        $(NT_INC)/unistd.h \
        $(GNU_LIB)/execinfo.h \
-       $(GNU_LIB)/ignore-value.h \
        $(GNU_LIB)/utimens.h \
        $(CONFIG_H) \
        $(C_CTYPE_H) \