# HG changeset patch
# User Tassilo Horn <tassilo@member.fsf.org>
# Date 1258725918 0
# Node ID 42b0c234616ae65df794885e149ea84d9e0dfd1a
# Parent  4cee82a6f25bcfb82c38d97de0d1eb22ff3e7374
	* makefile.w32-in: Don't refer cc-subword.elc but subword.elc.

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

diff -r 4cee82a6f25b -r 42b0c234616a lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Nov 20 09:44:42 2009 +0000
+++ b/lisp/ChangeLog	Fri Nov 20 14:05:18 2009 +0000
@@ -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 -r 4cee82a6f25b -r 42b0c234616a lisp/Makefile.in
--- a/lisp/Makefile.in	Fri Nov 20 09:44:42 2009 +0000
+++ b/lisp/Makefile.in	Fri Nov 20 14:05:18 2009 +0000
@@ -1208,7 +1208,6 @@
 	$(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 @@
 	$(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-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-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 -r 4cee82a6f25b -r 42b0c234616a lisp/makefile.w32-in
--- a/lisp/makefile.w32-in	Fri Nov 20 09:44:42 2009 +0000
+++ b/lisp/makefile.w32-in	Fri Nov 20 14:05:18 2009 +0000
@@ -512,7 +512,7 @@
  $(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-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