Mercurial > emacs

changeset 108976:abd6714f59e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Makefile.in (lisp, shortlisp): Use new location of vc-hooks and ediff-hook.
author Romain Francoise <romain@orebokech.com>
date Sat, 12 Jun 2010 12:58:54 +0200
parents c4552014bea2
children 2cb186cf98b1
files src/ChangeLog src/Makefile.in
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sat Jun 12 10:59:37 2010 +0200
+++ b/src/ChangeLog	Sat Jun 12 12:58:54 2010 +0200
@@ -1,3 +1,8 @@
+2010-06-12  Romain Francoise  <romain@orebokech.com>
+
+	* Makefile.in (lisp, shortlisp): Use new location of vc-hooks and
+	ediff-hook.
+
 2010-06-10  Glenn Morris  <rgm@gnu.org>
 
 	* editfns.c (Fbyte_to_string): Pacify compiler.
--- a/src/Makefile.in	Sat Jun 12 10:59:37 2010 +0200
+++ b/src/Makefile.in	Sat Jun 12 12:58:54 2010 +0200
@@ -458,8 +458,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} \
 	${MSDOS_SUPPORT} \
@@ -549,9 +549,9 @@
 	../lisp/textmodes/paragraphs.elc \
 	../lisp/textmodes/text-mode.elc \
 	../lisp/emacs-lisp/timer.elc \
-	../lisp/vc-hooks.elc \
+	../lisp/vc/vc-hooks.elc \
+	../lisp/vc/ediff-hook.elc \
 	../lisp/jka-cmpr-hook.elc \
-	../lisp/ediff-hook.elc \
 	../lisp/epa-hook.elc \
 	../lisp/widget.elc \
 	../lisp/window.elc \