src/makefile.w32-in: Update dependencies.

src/ChangeLog

@@ -2,6 +2,9 @@
 	* makefile.w32-in (LOCAL_FLAGS): Don't define HAVE_NTGUI, it's now
 	in nt/config.nt.
+	(FONT_H): Define after FRAME_H.
+	($(BLD)/emacs.$(O), $(BLD)/process.$(O), $(BLD)/w32heap.$(O)):
+	Update dependencies.
 	* w32term.c: Remove leftover declaration of keyboard_codepage.

src/makefile.w32-in

@@ -423,11 +423,11 @@ DISPEXTERN_H   = $(SRC)/dispextern.h \
 		 $(W32GUI_H)
 FILEMODE_H     = $(GNU_LIB)/filemode.h \
 		 $(NT_INC)/sys/stat.h
-FONT_H         = $(SRC)/font.h \
-		 $(FRAME_H) \
-		 $(CCL_H)
 FRAME_H        = $(SRC)/frame.h \
 		 $(DISPEXTERN_H)
+FONT_H         = $(SRC)/font.h \
+		 $(CCL_H) \
+		 $(FRAME_H)
 FTOASTR_H      = $(GNU_LIB)/ftoastr.h \
 		 $(GNU_LIB)/intprops.h
 GRP_H          = $(NT_INC)/grp.h \
@@ -800,7 +800,6 @@ $(BLD)/emacs.$(O) : \
 	$(SRC)/w32.h \
 	$(SRC)/w32heap.h \
 	$(SRC)/w32select.h \
-	$(SRC)/w32font.h \
 	$(NT_INC)/sys/file.h \
 	$(NT_INC)/unistd.h \
 	$(GNU_LIB)/ignore-value.h \
@@ -816,6 +815,7 @@ $(BLD)/emacs.$(O) : \
 	$(SYSSIGNAL_H) \
 	$(SYSTTY_H) \
 	$(TERMHOOKS_H) \
+	$(W32FONT_H) \
 	$(W32TERM_H) \
 	$(WINDOW_H)
 
@@ -1190,8 +1190,8 @@ $(BLD)/w32.$(O) : \
 
 $(BLD)/w32heap.$(O) : \
 	$(SRC)/w32heap.c \
-	$(SRC)/w32heap.h \
 	$(SRC)/w32common.h \
+	$(SRC)/w32heap.h \
 	$(CONFIG_H) \
 	$(LISP_H)