From: Romain Francoise <romain@orebokech.com>
Date: Sat, 12 Jun 2010 10:58:54 +0000 (+0200)
Subject: * Makefile.in (lisp, shortlisp): Use new location of vc-hooks and ediff-hook.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~64
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4176cba214cb44e6370cf951a9984c03bb2c4f9c;p=emacs.git

* Makefile.in (lisp, shortlisp): Use new location of vc-hooks and ediff-hook.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 99ca9895c0e..44fe7f21ac8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/Makefile.in b/src/Makefile.in
index ceef8c3bf67..b2fec7eb085 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -458,8 +458,8 @@ lisp= \
 	${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 @@ shortlisp= \
 	../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 \