[Emacs-diffs] /srv/bzr/emacs/trunk r100585: Fix Windows makefiles to adapt to lisp/vc reorganization.

[Juanma Barranquero]

------------------------------------------------------------
revno: 100585
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Fri 2010-06-11 23:26:13 +0200
message:
  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.
modified:
  lib-src/ChangeLog
  lib-src/makefile.w32-in
  lisp/ChangeLog
  lisp/makefile.w32-in

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2010-06-10 01:04:45 +0000
+++ b/lib-src/ChangeLog 2010-06-11 21:26:13 +0000
@@ -1,3 +1,8 @@
+2010-06-11  Juanma Barranquero  <address@hidden>
+
+       * makefile.w32-in (lisp2): Fix references to vc/vc-hooks.elc
+       and vc/ediff-hook.elc.
+
 2010-06-06  Dan Nicolaescu  <address@hidden>
 
        * ntlib.h: Remove code dealing with BSTRING.

=== modified file 'lib-src/makefile.w32-in'
--- a/lib-src/makefile.w32-in   2010-05-08 18:47:07 +0000
+++ b/lib-src/makefile.w32-in   2010-06-11 21:26:13 +0000
@@ -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) \

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-11 21:19:23 +0000
+++ b/lisp/ChangeLog    2010-06-11 21:26:13 +0000
@@ -1,5 +1,7 @@
 2010-06-11  Juanma Barranquero  <address@hidden>
 
+       * makefile.w32-in (WINS_BASIC): Include new directory vc.
+
        * loadup.el ("vc-hooks", "ediff-hook"): Load from lisp/vc/.
 
 2010-06-11  Juri Linkov  <address@hidden>

=== modified file 'lisp/makefile.w32-in'
--- a/lisp/makefile.w32-in      2010-01-13 08:35:10 +0000
+++ b/lisp/makefile.w32-in      2010-06-11 21:26:13 +0000
@@ -114,7 +114,8 @@
        play \
        progmodes \
        textmodes \
-       url
+       url \
+       vc
 
 # Directories with lisp files to compile, and to extract data from
 # (customs, autoloads, etc.)