Move NT-specific include file to the NT include directory

[bpt/emacs.git] / src / makefile.w32-in

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 0106616..31dc94f 100644 (file)
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -1,4 +1,4 @@
-# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
+# -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
 # Copyright (C) 2000-2012  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -339,7 +339,7 @@ cleanall:   clean
 ##
 ## This works only with GNU Make.
 
-TAGS: $(OBJ0) $(OBJ1) $(OBJ2) $(CURDIR)/s/ms-w32.h
+TAGS: $(OBJ0) $(OBJ1) $(OBJ2) $(CURDIR)/../nt/inc/ms-w32.h
        $(MAKE) $(MFLAGS) TAGS-$(MAKETYPE)
 
 TAGS-LISP: $(OBJ0) $(OBJ1) $(OBJ2)
@@ -353,7 +353,7 @@ TAGS-gmake:
          $(OBJ1_c)
        ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \
          $(OBJ2_c) \
-         $(CURDIR)/*.h $(CURDIR)/s/ms-w32.h
+         $(CURDIR)/*.h $(CURDIR)/../nt/inc/ms-w32.h
 
 TAGS-nmake:
        echo This target is not supported with NMake
@@ -403,10 +403,12 @@ CHARSET_H      = $(SRC)/charset.h \
                 $(GNU_LIB)/verify.h
 CODING_H       = $(SRC)/coding.h \
                 $(SRC)/composite.h
-MS_W32_H       = $(SRC)/s/ms-w32.h \
+MS_W32_H       = $(NT_INC)/ms-w32.h \
                 $(NT_INC)/sys/stat.h
-CONFIG_H       = $(SRC)/config.h \
+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 \
@@ -438,7 +440,8 @@ LANGINFO_H     = $(NT_INC)/langinfo.h \
 LISP_H         = $(SRC)/lisp.h \
                 $(SRC)/globals.h \
                 $(GNU_LIB)/intprops.h \
-                $(INTTYPES_H)
+                $(INTTYPES_H) \
+                $(NT_INC)/stdalign.h
 MD5_H          = $(GNU_LIB)/md5.h \
                 $(NT_INC)/stdint.h
 MENU_H         = $(SRC)/menu.h \
@@ -1163,6 +1166,7 @@ $(BLD)/w32inevt.$(O) : \
        $(SRC)/w32inevt.c \
        $(SRC)/termchar.h \
        $(SRC)/w32heap.h \
+       $(SRC)/w32inevt.h \
        $(BLOCKINPUT_H) \
        $(CONFIG_H) \
        $(DISPEXTERN_H) \
@@ -1194,6 +1198,7 @@ $(BLD)/w32console.$(O) : \
        $(SRC)/w32console.c \
        $(SRC)/disptab.h \
        $(SRC)/termchar.h \
+       $(SRC)/w32heap.h \
        $(SRC)/w32inevt.h \
        $(CHARACTER_H) \
        $(CODING_H) \