Merge from trunk and resolve conflicts.

1 files changed, 27 insertions, 5 deletions

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index a296f6eb393..93f12900dde 100644
--- 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-2012  Free Software Foundation, Inc.
+# Copyright (C) 2000-2013 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -134,6 +134,7 @@ OBJ2 =  $(BLD)/sysdep.$(O)		\
         $(BLD)/w32menu.$(O)             \
         $(BLD)/w32reg.$(O)              \
         $(BLD)/w32font.$(O)             \
+        $(BLD)/w32notify.$(O)           \
         $(BLD)/w32uniscribe.$(O)
 
 LIBS =  $(TLIB0)        \
@@ -209,7 +210,7 @@ GLOBAL_SOURCES =   dosfns.c msdos.c \
         fontset.c menu.c dbusbind.c \
         w32.c w32console.c w32fns.c w32heap.c w32inevt.c cygw32.c \
         w32menu.c w32proc.c w32reg.c w32select.c w32term.c w32xfns.c \
-        font.c w32font.c w32uniscribe.c \
+        font.c w32font.c w32uniscribe.c w32notify.c \
         dispnew.c frame.c scroll.c xdisp.c window.c bidi.c \
         charset.c coding.c category.c ccl.c character.c chartab.c \
         cm.c term.c terminal.c xfaces.c \
@@ -461,6 +462,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
 SOCKET_H       = $(NT_INC)/sys/socket.h \
                  $(SRC)/w32.h
 STAT_TIME_H    = $(GNU_LIB)/stat-time.h \
@@ -471,6 +474,7 @@ SYSTTY_H       = $(SRC)/systty.h \
                  $(NT_INC)/sys/ioctl.h \
                  $(NT_INC)/unistd.h
 SYSWAIT_H      = $(SRC)/syswait.h \
+                 $(NT_INC)/stdbool.h \
                  $(NT_INC)/sys/wait.h
 TERMHOOKS_H    = $(SRC)/termhooks.h \
                  $(SYSTIME_H)
@@ -786,6 +790,7 @@ $(BLD)/editfns.$(O) : \
         $(CODING_H) \
         $(CONFIG_H) \
         $(FRAME_H) \
+        $(GRP_H) \
         $(INTERVALS_H) \
         $(LISP_H) \
         $(SYSTIME_H) \
@@ -799,6 +804,7 @@ $(BLD)/emacs.$(O) : \
         $(SRC)/keymap.h \
         $(SRC)/unexec.h \
         $(SRC)/w32.h \
+        $(SRC)/w32common.h \
         $(SRC)/w32heap.h \
         $(SRC)/w32select.h \
         $(NT_INC)/sys/file.h \
@@ -837,10 +843,13 @@ $(BLD)/fileio.$(O) : \
         $(SRC)/commands.h \
         $(SRC)/w32.h \
         $(NT_INC)/pwd.h \
+        $(NT_INC)/sys/acl.h \
         $(NT_INC)/sys/file.h \
         $(NT_INC)/sys/stat.h \
         $(NT_INC)/unistd.h \
+        $(GNU_LIB)/allocator.h \
         $(BUFFER_H) \
+        $(CAREADLINKAT_H) \
         $(CHARACTER_H) \
         $(CODING_H) \
         $(CONFIG_H) \
@@ -855,6 +864,7 @@ $(BLD)/fileio.$(O) : \
 
 $(BLD)/filelock.$(O) : \
         $(SRC)/filelock.c \
+        $(SRC)/w32.h \
         $(NT_INC)/pwd.h \
         $(NT_INC)/sys/file.h \
         $(NT_INC)/sys/stat.h \
@@ -1179,6 +1189,7 @@ $(BLD)/w32.$(O) : \
         $(SRC)/w32select.h \
         $(NT_INC)/dirent.h \
         $(NT_INC)/pwd.h \
+        $(NT_INC)/sys/acl.h \
         $(NT_INC)/sys/file.h \
         $(NT_INC)/sys/time.h \
         $(GNU_LIB)/allocator.h \
@@ -1287,11 +1298,13 @@ $(BLD)/process.$(O) : \
         $(CHARACTER_H) \
         $(CODING_H) \
         $(CONFIG_H) \
+        $(C_CTYPE_H) \
         $(DISPEXTERN_H) \
         $(FRAME_H) \
         $(KEYBOARD_H) \
         $(LISP_H) \
         $(PROCESS_H) \
+        $(SIG2STR_H) \
         $(SOCKET_H) \
         $(SYSSIGNAL_H) \
         $(SYSTIME_H) \
@@ -1387,11 +1400,9 @@ $(BLD)/sysdep.$(O) : \
         $(NT_INC)/sys/file.h \
         $(NT_INC)/sys/stat.h \
         $(NT_INC)/unistd.h \
-        $(GNU_LIB)/allocator.h \
         $(GNU_LIB)/execinfo.h \
         $(GNU_LIB)/ignore-value.h \
         $(GNU_LIB)/utimens.h \
-        $(CAREADLINKAT_H) \
         $(CONFIG_H) \
         $(C_CTYPE_H) \
         $(DISPEXTERN_H) \
@@ -1482,7 +1493,6 @@ $(BLD)/unexw32.$(O) : \
 
 $(BLD)/vm-limit.$(O) : \
         $(SRC)/vm-limit.c \
-        $(SRC)/mem-limits.h \
         $(SRC)/w32heap.h \
         $(NT_INC)/unistd.h \
         $(CONFIG_H) \
@@ -1693,6 +1703,18 @@ $(BLD)/w32uniscribe.$(O) : \
         $(W32FONT_H) \
         $(W32TERM_H)
 
+$(BLD)/w32notify.$(O) : \
+        $(SRC)/w32notify.c \
+        $(SRC)/w32.h \
+        $(SRC)/w32common.h \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(FRAME_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(TERMHOOKS_H) \
+        $(W32TERM_H)
+
 # Each object file depends on stamp_BLD, because in parallel builds we must
 # make sure $(BLD) exists before starting compilations.
 #