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 --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 606147f03aa0060020847d9824574605f90bcb0e..079941811c0957002b740d217263ef56da4fc9fb 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -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 --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index bed28752f7bf71f0e04ffd5914b9ca5e377ab7e2..cad3b838208d282880a6293e3e60536281a85c09 100644 (file)
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -279,8 +279,8 @@ lisp2 = \
        $(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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 92616097b6da1807c58d231281ba38bbdd416ac1..4bccd2c7980d6a00ce73f2548902bb7ed8ff09e7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index aebb8b352e71fe61a4e5f6416fa175320002d75c..871b690f007b4f37baf0a8f4b9bf47facb8dcebd 100644 (file)
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -114,7 +114,8 @@ WINS_BASIC=\
        play \
        progmodes \
        textmodes \
-       url
+       url \
+       vc
 
 # Directories with lisp files to compile, and to extract data from
 # (customs, autoloads, etc.)