From: Tassilo Horn <tassilo@member.fsf.org>
Date: Fri, 20 Nov 2009 14:05:18 +0000 (+0000)
Subject: * makefile.w32-in: Don't refer cc-subword.elc but subword.elc.
X-Git-Tag: emacs-pretest-23.1.90~302
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1f35fda94f3aeaeec99fd327ea34d70b8dbdd30b;p=emacs.git

* makefile.w32-in: Don't refer cc-subword.elc but subword.elc.

	* Makefile.in: Don't refer cc-subword.elc but subword.elc.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c3cab24033..d0eb4efbcc7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2009-11-20  Tassilo Horn  <tassilo@member.fsf.org>
 
+	* makefile.w32-in: Don't refer cc-subword.elc but subword.elc.
+
+	* Makefile.in: Don't refer cc-subword.elc but subword.elc.
+
 	* progmodes/cc-cmds.el (c-update-modeline)
 	(c-forward-into-nomenclature, c-backward-into-nomenclature): Refer
 	to subword.el functions instead of cc-subword.el.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index af50e8ef0ee..391a829d3f6 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1208,7 +1208,6 @@ ELCFILES = \
 	$(lisp)/progmodes/cc-menus.elc \
 	$(lisp)/progmodes/cc-mode.elc \
 	$(lisp)/progmodes/cc-styles.elc \
-	$(lisp)/progmodes/cc-subword.elc \
 	$(lisp)/progmodes/cc-vars.elc \
 	$(lisp)/progmodes/cfengine.elc \
 	$(lisp)/progmodes/cmacexp.elc \
@@ -1309,6 +1308,7 @@ ELCFILES = \
 	$(lisp)/startup.elc \
 	$(lisp)/strokes.elc \
 	$(lisp)/subr.elc \
+	$(lisp)/subword.elc \
 	$(lisp)/t-mouse.elc \
 	$(lisp)/tabify.elc \
 	$(lisp)/talk.elc \
@@ -1657,7 +1657,7 @@ $(lisp)/progmodes/cc-align.elc $(lisp)/progmodes/cc-awk.elc\
  $(lisp)/progmodes/cc-engine.elc $(lisp)/progmodes/cc-fonts.elc\
  $(lisp)/progmodes/cc-langs.elc $(lisp)/progmodes/cc-menus.elc\
  $(lisp)/progmodes/cc-mode.elc $(lisp)/progmodes/cc-styles.elc\
- $(lisp)/progmodes/cc-subword.elc $(lisp)/progmodes/cc-vars.elc: \
+ $(lisp)/progmodes/cc-vars.elc: \
    $(lisp)/progmodes/cc-bytecomp.elc $(lisp)/progmodes/cc-defs.elc
 
 $(lisp)/progmodes/cc-align.elc: \
@@ -1691,8 +1691,6 @@ $(lisp)/progmodes/cc-mode.elc: $(lisp)/progmodes/cc-langs.elc \
 $(lisp)/progmodes/cc-styles.elc: $(lisp)/progmodes/cc-vars.elc \
    $(lisp)/progmodes/cc-align.elc
 
-$(lisp)/progmodes/cc-subword.elc: $(lisp)/progmodes/cc-cmds.elc
-
 $(lisp)/progmodes/cc-vars.elc: $(lisp)/custom.elc $(lisp)/widget.elc
 
 # MH-E dependencies, mainly to prevent failures with parallel
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 8c006f25eb3..6b36da51757 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -512,7 +512,7 @@ $(lisp)/progmodes/cc-align.elc $(lisp)/progmodes/cc-awk.elc\
  $(lisp)/progmodes/cc-engine.elc $(lisp)/progmodes/cc-fonts.elc\
  $(lisp)/progmodes/cc-langs.elc $(lisp)/progmodes/cc-menus.elc\
  $(lisp)/progmodes/cc-mode.elc $(lisp)/progmodes/cc-styles.elc\
- $(lisp)/progmodes/cc-subword.elc $(lisp)/progmodes/cc-vars.elc: \
+ $(lisp)/progmodes/cc-vars.elc: \
    $(lisp)/progmodes/cc-bytecomp.elc $(lisp)/progmodes/cc-defs.elc
 
 $(lisp)/progmodes/cc-align.elc: \
@@ -546,8 +546,6 @@ $(lisp)/progmodes/cc-mode.elc: $(lisp)/progmodes/cc-langs.elc \
 $(lisp)/progmodes/cc-styles.elc: $(lisp)/progmodes/cc-vars.elc \
    $(lisp)/progmodes/cc-align.elc
 
-$(lisp)/progmodes/cc-subword.elc: $(lisp)/progmodes/cc-cmds.elc
-
 $(lisp)/progmodes/cc-vars.elc: $(lisp)/custom.elc $(lisp)/widget.elc
 
 # MH-E dependencies, mainly to prevent failures with parallel