# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1276291573 -7200
# Node ID 506ba691342fa34d9169da0b57f88b4559e9a429
# Parent  086d8a46a85d2e6fb12fc0b68231dbccc67091b9
Fix Windows makefiles to adapt to lisp/vc reorganization.

* lib-src/makefile.w32-in (lisp2): Fix references to vc/vc-hooks.elc
  and vc/ediff-hook.elc.

* lisp/makefile.w32-in (WINS_BASIC): Include new directory vc.

diff -r 086d8a46a85d -r 506ba691342f lib-src/ChangeLog
--- a/lib-src/ChangeLog	Fri Jun 11 23:19:23 2010 +0200
+++ b/lib-src/ChangeLog	Fri Jun 11 23:26:13 2010 +0200
@@ -1,3 +1,8 @@
+2010-06-11  Juanma Barranquero  <lekktu@gmail.com>
+
+	* makefile.w32-in (lisp2): Fix references to vc/vc-hooks.elc
+	and vc/ediff-hook.elc.
+
 2010-06-06  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* ntlib.h: Remove code dealing with BSTRING.
diff -r 086d8a46a85d -r 506ba691342f lib-src/makefile.w32-in
--- a/lib-src/makefile.w32-in	Fri Jun 11 23:19:23 2010 +0200
+++ b/lib-src/makefile.w32-in	Fri Jun 11 23:26:13 2010 +0200
@@ -279,8 +279,8 @@
 	$(lispsource)textmodes/text-mode.elc \
 	$(lispsource)emacs-lisp/timer.elc \
 	$(lispsource)jka-cmpr-hook.elc \
-	$(lispsource)vc-hooks.elc \
-	$(lispsource)ediff-hook.elc \
+	$(lispsource)vc/vc-hooks.elc \
+	$(lispsource)vc/ediff-hook.elc \
 	$(lispsource)epa-hook.elc \
 	$(TOOLTIP_SUPPORT) \
 	$(WINNT_SUPPORT) \
diff -r 086d8a46a85d -r 506ba691342f lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jun 11 23:19:23 2010 +0200
+++ b/lisp/ChangeLog	Fri Jun 11 23:26:13 2010 +0200
@@ -1,5 +1,7 @@
 2010-06-11  Juanma Barranquero  <lekktu@gmail.com>
 
+	* makefile.w32-in (WINS_BASIC): Include new directory vc.
+
 	* loadup.el ("vc-hooks", "ediff-hook"): Load from lisp/vc/.
 
 2010-06-11  Juri Linkov  <juri@jurta.org>
diff -r 086d8a46a85d -r 506ba691342f lisp/makefile.w32-in
--- a/lisp/makefile.w32-in	Fri Jun 11 23:19:23 2010 +0200
+++ b/lisp/makefile.w32-in	Fri Jun 11 23:26:13 2010 +0200
@@ -114,7 +114,8 @@
 	play \
 	progmodes \
 	textmodes \
-	url
+	url \
+	vc
 
 # Directories with lisp files to compile, and to extract data from
 # (customs, autoloads, etc.)