From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 8 Oct 2012 12:21:04 +0000 (+0200)
Subject: Update w32 dependencies in the wake of cygw32 changes.
X-Git-Tag: emacs-24.2.90~237^2~48
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c54ebba4e076caeb6105c6bb682252b139a169fa;p=emacs.git

Update w32 dependencies in the wake of cygw32 changes.

 src/makefile.w32-in (FONT_H): Add $(FRAME_H).
 (W32TERM_H): Add $(ATIMER_H) and $(FRAME_H).
 ($(BLD)/emacs.$(O), $(BLD)/w32console.$(O)): Update dependencies.
 (GLOBAL_SOURCES): Add cygw32.c.

 lib-src/makefile.w32-in (obj): Add cygw32.o.
---

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index a4234693a82..85351d7f08d 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-08  Eli Zaretskii  <eliz@gnu.org>
+
+	* makefile.w32-in (obj): Add cygw32.o.
+
 2012-10-08  Daniel Colascione  <dancol@dancol.org>
 
 	* emacsclient.c: Include windows.h when HAVE_NTGUI.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 23ef71de10c..ecc5fb866b3 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -124,7 +124,7 @@ $(BLD)/profile.exe:	$(PROFILEOBJS)
 obj =   dosfns.o msdos.o \
 	xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
 	fontset.o menu.o \
-	w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
+	w32.o w32console.o w32fns.o w32heap.o w32inevt.o cygw32.o \
 	w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
 	font.o w32font.o w32uniscribe.o \
 	dispnew.o frame.o scroll.o xdisp.o window.o bidi.o \
diff --git a/src/ChangeLog b/src/ChangeLog
index 7d2509b88cf..9e8377c2f7c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2012-10-08  Eli Zaretskii  <eliz@gnu.org>
 
+	* makefile.w32-in (FONT_H): Add $(FRAME_H).
+	(W32TERM_H): Add $(ATIMER_H) and $(FRAME_H).
+	($(BLD)/emacs.$(O), $(BLD)/w32console.$(O)): Update dependencies.
+	(GLOBAL_SOURCES): Add cygw32.c.
+
 	* w32fns.c (w32_color_map_lookup, x_to_w32_color): Argument is now
 	'const char *'.
 	(x_to_w32_color): Don't modify the argument, modify a copy instead.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index c6fbf59fb5a..120fda9ec43 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -207,7 +207,7 @@ make-buildobj-SH:
 GLOBAL_SOURCES =   dosfns.c msdos.c \
 	xterm.c xfns.c xmenu.c xselect.c xrdb.c xsmfns.c fringe.c image.c \
 	fontset.c menu.c dbusbind.c \
-	w32.c w32console.c w32fns.c w32heap.c w32inevt.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 \
 	dispnew.c frame.c scroll.c xdisp.c window.c bidi.c \
@@ -424,6 +424,7 @@ DISPEXTERN_H   = $(SRC)/dispextern.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)
@@ -476,6 +477,8 @@ TERMHOOKS_H    = $(SRC)/termhooks.h \
 W32FONT_H      = $(SRC)/w32font.h \
 		 $(FONT_H)
 W32TERM_H      = $(SRC)/w32term.h \
+		 $(ATIMER_H) \
+		 $(FRAME_H) \
 		 $(W32GUI_H)
 WINDOW_H       = $(SRC)/window.h \
 		 $(DISPEXTERN_H)
@@ -796,6 +799,8 @@ $(BLD)/emacs.$(O) : \
 	$(SRC)/unexec.h \
 	$(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 \
@@ -1233,6 +1238,7 @@ $(BLD)/w32console.$(O) : \
 	$(FRAME_H) \
 	$(LISP_H) \
 	$(TERMHOOKS_H) \
+	$(W32TERM_H) \
 	$(WINDOW_H)
 
 $(BLD)/print.$(O) : \