X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/e1d276cbf9e18f13101328f56bed1a1c0a66e63a..8b55eeeb70be4b4ff3dd4694013bdb1a9f668bc6:/src/makefile.w32-in

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 9778e95567..f4885580e1 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.
 
@@ -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)
 
@@ -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 \
@@ -229,12 +230,12 @@ SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
 obj = $(GLOBAL_SOURCES:.c=.o)
 
 globals.h: gl-stamp
-	@cmd /c rem true
+	@cmd $(SWITCHCHAR)c rem true
 
 gl-stamp: ../lib-src/$(BLD)/make-docfile.exe $(GLOBAL_SOURCES)
 	- $(DEL) gl-tmp
 	"$(THISDIR)/../lib-src/$(BLD)/make-docfile" -d . -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp
-	cmd /c "fc /b gl-tmp globals.h >nul 2>&1 || $(CP) gl-tmp globals.h"
+	fc.exe $(SWITCHCHAR)b gl-tmp globals.h >nul 2>&1 || $(CP) gl-tmp globals.h
 	- $(DEL) gl-tmp
 	echo timestamp > $@
 
@@ -387,6 +388,9 @@ EMACS_ROOT = ..
 GNU_LIB = $(EMACS_ROOT)/lib
 NT_INC = $(EMACS_ROOT)/nt/inc
 
+ACL_H	       = $(GNU_LIB)/acl.h \
+		 $(NT_INC)/sys/stat.h \
+		 $(NT_INC)/stdbool.h
 SYSTIME_H      = $(SRC)/systime.h \
 		 $(NT_INC)/sys/time.h \
 		 $(GNU_LIB)/timespec.h
@@ -413,8 +417,6 @@ CONF_POST_H    = $(SRC)/conf_post.h \
 		 $(MS_W32_H)
 CONFIG_H       = $(SRC)/config.h \
 		 $(CONF_POST_H)
-DIR_H          = $(NT_INC)/sys/dir.h \
-		 $(SRC)/ndir.h
 W32GUI_H       = $(SRC)/w32gui.h \
 		 $(SYSTIME_H)
 DISPEXTERN_H   = $(SRC)/dispextern.h \
@@ -463,6 +465,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 \
@@ -473,6 +477,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)
@@ -714,6 +719,7 @@ $(BLD)/dired.$(O) : \
 	$(SRC)/blockinput.h \
 	$(SRC)/commands.h \
 	$(SRC)/regex.h \
+	$(NT_INC)/dirent.h \
 	$(NT_INC)/pwd.h \
 	$(NT_INC)/sys/stat.h \
 	$(NT_INC)/unistd.h \
@@ -722,7 +728,6 @@ $(BLD)/dired.$(O) : \
 	$(CHARSET_H) \
 	$(CODING_H) \
 	$(CONFIG_H) \
-	$(DIR_H) \
 	$(FILEMODE_H) \
 	$(GRP_H) \
 	$(LISP_H) \
@@ -788,6 +793,7 @@ $(BLD)/editfns.$(O) : \
 	$(CODING_H) \
 	$(CONFIG_H) \
 	$(FRAME_H) \
+	$(GRP_H) \
 	$(INTERVALS_H) \
 	$(LISP_H) \
 	$(SYSTIME_H) \
@@ -801,12 +807,12 @@ $(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 \
 	$(NT_INC)/unistd.h \
 	$(GNU_LIB)/close-stream.h \
-	$(GNU_LIB)/ignore-value.h \
 	$(ATIMER_H) \
 	$(BUFFER_H) \
 	$(CHARACTER_H) \
@@ -839,10 +845,14 @@ $(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 \
+	$(ACL_H) \
 	$(BUFFER_H) \
+	$(CAREADLINKAT_H) \
 	$(CHARACTER_H) \
 	$(CODING_H) \
 	$(CONFIG_H) \
@@ -857,6 +867,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 \
@@ -865,6 +876,7 @@ $(BLD)/filelock.$(O) : \
 	$(CHARACTER_H) \
 	$(CODING_H) \
 	$(CONFIG_H) \
+	$(C_CTYPE_H) \
 	$(LISP_H) \
 	$(SYSTIME_H)
 
@@ -1175,12 +1187,13 @@ $(BLD)/minibuf.$(O) : \
 
 $(BLD)/w32.$(O) : \
 	$(SRC)/w32.c \
-	$(SRC)/ndir.h \
 	$(SRC)/w32.h \
 	$(SRC)/w32common.h \
 	$(SRC)/w32heap.h \
 	$(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 \
@@ -1289,11 +1302,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,13 +1402,11 @@ $(BLD)/sysdep.$(O) : \
 	$(NT_INC)/netdb.h \
 	$(NT_INC)/pwd.h \
 	$(NT_INC)/sys/file.h \
+	$(NT_INC)/sys/param.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) \
@@ -1484,7 +1497,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) \
@@ -1695,6 +1707,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.
 #