From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 26 Sep 2008 10:11:39 +0000 (+0000)
Subject: ($(lisp)/progmodes/cc-mode.elc): Remove.
X-Git-Tag: emacs-pretest-23.0.90~2751
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4860b1b84aab9ebe710f0b23303a817cb057736f;p=emacs.git

($(lisp)/progmodes/cc-mode.elc): Remove.
($(lisp)/progmodes/cc-align.elc, $(lisp)/progmodes/cc-cmds.elc)
($(lisp)/progmodes/cc-compat.elc, $(lisp)/progmodes/cc-defs.elc)
($(lisp)/progmodes/cc-engine.elc)
($(lisp)/progmodes/cc-fonts.elc, $(lisp)/progmodes/cc-langs.elc)
($(lisp)/progmodes/cc-mode.elc, $(lisp)/progmodes/cc-styles.elc)
($(lisp)/progmodes/cc-subword.elc)
($(lisp)/progmodes/cc-vars.elc): New dependencies.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4161d80f26b..2b41420e17d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2008-09-26  Eli Zaretskii  <eliz@gnu.org>
+
+	* Makefile.in ($(lisp)/progmodes/cc-mode.elc): Remove.
+	($(lisp)/progmodes/cc-align.elc, $(lisp)/progmodes/cc-cmds.elc)
+	($(lisp)/progmodes/cc-compat.elc, $(lisp)/progmodes/cc-defs.elc)
+	($(lisp)/progmodes/cc-engine.elc)
+	($(lisp)/progmodes/cc-fonts.elc, $(lisp)/progmodes/cc-langs.elc)
+	($(lisp)/progmodes/cc-mode.elc, $(lisp)/progmodes/cc-styles.elc)
+	($(lisp)/progmodes/cc-subword.elc)
+	($(lisp)/progmodes/cc-vars.elc): New dependencies.
+
 2008-09-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* informat.el (Info-split-threshold): New variable.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index fd0375ceeb0..15ad1426e29 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1362,15 +1362,6 @@ compile-after-backup: backup-compiled-files compile-always
 recompile: doit $(LOADDEFS) $(lisp)/progmodes/cc-mode.elc
 	$(emacs) --eval "(batch-byte-recompile-directory 0)" $(lisp)
 
-# CC Mode uses a compile time macro system which causes a compile time
-# dependency in cc-mode.elc on the macros in cc-langs.el and the
-# version string in cc-defs.el.
-$(lisp)/progmodes/cc-mode.elc: \
-	$(lisp)/progmodes/cc-mode.el \
-	$(lisp)/progmodes/cc-langs.el \
-	$(lisp)/progmodes/cc-defs.el
-	$(emacs) $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $<
-
 # Update MH-E internal autoloads. These are not to be confused with
 # the autoloads for the MH-E entry points, which are already in loaddefs.el.
 MH_E_DIR = $(lisp)/mh-e
@@ -1460,4 +1451,51 @@ check-declare:
 	$(emacs) -l $(lisp)/emacs-lisp/check-declare \
 	  --eval '(check-declare-directory "$(lisp)")'
 
+# Dependencies
+
+# CC Mode uses a compile time macro system which causes a compile time
+# dependency in cc-*.elc files on the macros in other cc-*.el and the
+# version string in cc-defs.el.
+$(lisp)/progmodes/cc-align.elc $(lisp)/progmodes/cc-awk.elc\
+ $(lisp)/progmodes/cc-cmds.elc $(lisp)/progmodes/cc-compat.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-bytecomp.elc $(lisp)/progmodes/cc-defs.elc
+
+$(lisp)/progmodes/cc-align.elc: \
+   $(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-engine.elc
+
+$(lisp)/progmodes/cc-cmds.elc: \
+   $(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-engine.elc
+
+$(lisp)/progmodes/cc-compat.elc: \
+   $(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-styles.elc \
+   $(lisp)/progmodes/cc-engine.elc
+
+$(lisp)/progmodes/cc-defs.elc: $(lisp)/progmodes/cc-bytecomp.elc \
+   $(lisp)/emacs-lisp/cl.elc $(lisp)/emacs-lisp/regexp-opt.elc
+
+$(lisp)/progmodes/cc-engine.elc: $(lisp)/progmodes/cc-langs.elc \
+   $(lisp)/progmodes/cc-vars.elc
+
+$(lisp)/progmodes/cc-fonts.elc: $(lisp)/progmodes/cc-langs.elc \
+   $(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-engine.elc \
+   $(lisp)/font-lock.elc
+
+$(lisp)/progmodes/cc-langs.elc: $(lisp)/progmodes/cc-vars.elc \
+   $(lisp)/emacs-lisp/cl.elc
+
+$(lisp)/progmodes/cc-mode.elc: $(lisp)/progmodes/cc-langs.elc \
+   $(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-engine.elc \
+   $(lisp)/progmodes/cc-styles.elc $(lisp)/progmodes/cc-cmds.elc \
+   $(lisp)/progmodes/cc-align.elc $(lisp)/progmodes/cc-menus.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
 # Makefile ends here.