* lisp/Makefile.in: Fix up last merge.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad7ee9adb3d13fa64b0390c7b110087f8210a56e..763d73c883be33b1d432986ca2fc7e61c4bda6be 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-11-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * Makefile.in: Fix up last merge.
+
        * vc/diff.el (diff-old-temp-file, diff-new-temp-file): Remove.
        (diff-sentinel): Get them as arguments instead.
        (diff-old-file, diff-new-file, diff-extra-args): Remove.
@@ -2111,10 +2113,6 @@
 
        * dired.el (dired-save-positions): Doc fix.  (Bug#7119)
 
-2010-10-08  Andreas Schwab  <schwab@linux-m68k.org>
-
-       * Makefile.in (ELCFILES): Update.
-
 2010-10-08  Glenn Morris  <rgm@gnu.org>
 
        * vc/ediff-wind.el (ediff-setup-control-frame):

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 7c42d1a94b11cfdb215e59b139e39ea9d2d59cf0..2b2081a25d0d28ff521be01c1ab863380a27f30f 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -180,7 +180,6 @@ TAGS TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptags
        els=`echo $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4) | sed -e "s,$(lisp)/[^ ]*loaddefs[^ ]*,," -e "s,$(lisp)/ldefs-boot[^ ]*,,"`; \
        ${ETAGS} -o $@ $$els
 
-       $(lisp)/emacs-lisp/smie.elc \
 # The src/Makefile.in has its own set of dependencies and when they decide
 # that one Lisp file needs to be re-compiled, we had better recompile it as
 # well, otherwise every subsequent make will again call us, until we finally