# HG changeset patch
# User Andreas Schwab <schwab@linux-m68k.org>
# Date 1254169119 0
# Node ID 20eb9b6c26fef40b8714c83becad9fb94d01f92c
# Parent  882ce3b1b1bd309c969a67e24170d5d5b5c01c67
(lisptagsfiles3): Define.
(TAGS TAGS-LISP): Use it.
(update-elclist): Add third directory level to look for elc files.
(compile-always): Likewise.
(backup-compiled-files): Likewise.
(bootstrap-clean): Likewise.
(ELCFILES): Update.

diff -r 882ce3b1b1bd -r 20eb9b6c26fe lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Sep 28 17:47:48 2009 +0000
+++ b/lisp/ChangeLog	Mon Sep 28 20:18:39 2009 +0000
@@ -1,3 +1,13 @@
+2009-09-28  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* Makefile.in (lisptagsfiles3): Define.
+	(TAGS TAGS-LISP): Use it.
+	(update-elclist): Add third directory level to look for elc files.
+	(compile-always): Likewise.
+	(backup-compiled-files): Likewise.
+	(bootstrap-clean): Likewise.
+	(ELCFILES): Update.
+
 2009-09-28  Chong Yidong  <cyd@stupidchicken.com>
 
 	* Makefile.in (ELCFILES): Add CEDET files.
diff -r 882ce3b1b1bd -r 20eb9b6c26fe lisp/Makefile.in
--- a/lisp/Makefile.in	Mon Sep 28 17:47:48 2009 +0000
+++ b/lisp/Makefile.in	Mon Sep 28 20:18:39 2009 +0000
@@ -41,6 +41,7 @@
 
 lisptagsfiles1 = $(lisp)/*.el
 lisptagsfiles2 = $(lisp)/*/*.el
+lisptagsfiles3 = $(lisp)/*/*/*.el
 ETAGS = ../lib-src/etags
 
 # Automatically generated autoload files, apart from lisp/loaddefs.el.
@@ -168,8 +169,8 @@
 update-authors:
 	$(emacs) -l authors -f batch-update-authors $(srcdir)/etc/AUTHORS $(srcdir)
 
-TAGS TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2)
-	els=`echo $(lisptagsfiles1) $(lisptagsfiles2) | sed -e "s,$(lisp)/[^ ]*loaddefs[^ ]*,," -e "s,$(lisp)/ldefs-boot[^ ]*,,"`; \
+TAGS TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3)
+	els=`echo $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) | sed -e "s,$(lisp)/[^ ]*loaddefs[^ ]*,," -e "s,$(lisp)/ldefs-boot[^ ]*,,"`; \
 	${ETAGS} -o $@ $$els
 
 .PHONY: update-elclist
@@ -184,7 +185,7 @@
 update-elclist:
 	echo "/^ELCFILES/,/^$$/c\\" > temp.sed
 	echo "ELCFILES =" | sed -e 's/$$/ \\\\\\/' >> temp.sed
-	LC_COLLATE=C ls $(lisp)/*.elc $(lisp)/*/*.elc | sed -e "s|^$(lisp)|	\$$(lisp)|" -e 's/$$/ \\\\\\/' -e '$$ s/ \\\\//' >> temp.sed
+	LC_COLLATE=C ls $(lisp)/*.elc $(lisp)/*/*.elc $(lisp)/*/*/*.elc | sed -e "s|^$(lisp)|	\$$(lisp)|" -e 's/$$/ \\\\\\/' -e '$$ s/ \\\\//' >> temp.sed
 	echo "" >> temp.sed
 	-sed -f temp.sed $(lisp)/Makefile.in > temp-elcfiles || rm temp-elcfiles
 	rm temp.sed
@@ -193,9 +194,9 @@
 	  chmod +w $(lisp)/Makefile.in; \
 	  mv -f temp-elcfiles $(lisp)/Makefile.in; \
 	fi
-	-(COLLATE=C ls $(lisp)/*.elc $(lisp)/*/*.elc | sed 's/elc$$/el/';  \
-	  COLLATE=C ls $(lisp)/*.el  $(lisp)/*/*.el;   			   \
-	  COLLATE=C ls $(lisp)/*.el  $(lisp)/*/*.el) | 			   \
+	-(COLLATE=C ls $(lisp)/*.elc $(lisp)/*/*.elc $(lisp)/*/*/*.elc | sed 's/elc$$/el/';  \
+	  COLLATE=C ls $(lisp)/*.el  $(lisp)/*/*.el $(lisp)/*/*/*.el;  	   \
+	  COLLATE=C ls $(lisp)/*.el  $(lisp)/*/*.el $(lisp)/*/*/*.el) |	   \
 	     sort | uniq -u | while read extra; do 			   \
 	         echo "Found left over byte-compiled file: $${extra}c !!" ;\
 	     done
@@ -295,147 +296,120 @@
 	$(lisp)/calendar/timeclock.elc \
 	$(lisp)/calendar/todo-mode.elc \
 	$(lisp)/case-table.elc \
-	$(lisp)/cedet/cedet.el \
-	$(lisp)/cedet/cedet-cscope.el \
-	$(lisp)/cedet/cedet-files.el \
-	$(lisp)/cedet/cedet-global.el \
-	$(lisp)/cedet/cedet-idutils.el \
-	$(lisp)/cedet/inversion.el \
-	$(lisp)/cedet/mode-local.el \
-	$(lisp)/cedet/pulse.el \
-	$(lisp)/cedet/data-debug.el \
-	$(lisp)/cedet/ede.el \
-	$(lisp)/cedet/semantic.el \
-	$(lisp)/cedet/srecode.el \
-	$(lisp)/cedet/ede/autoconf-edit.el \
-	$(lisp)/cedet/ede/cpp-root.el \
-	$(lisp)/cedet/ede/dired.el \
-	$(lisp)/cedet/ede/emacs.el \
-	$(lisp)/cedet/ede/files.el \
-	$(lisp)/cedet/ede/linux.el \
-	$(lisp)/cedet/ede/locate.el \
-	$(lisp)/cedet/ede/make.el \
-	$(lisp)/cedet/ede/makefile-edit.el \
-	$(lisp)/cedet/ede/pconf.el \
-	$(lisp)/cedet/ede/pmake.el \
-	$(lisp)/cedet/ede/proj-archive.el \
-	$(lisp)/cedet/ede/proj-aux.el \
-	$(lisp)/cedet/ede/proj-comp.el \
-	$(lisp)/cedet/ede/proj-elisp.el \
-	$(lisp)/cedet/ede/proj-info.el \
-	$(lisp)/cedet/ede/proj-misc.el \
-	$(lisp)/cedet/ede/proj-obj.el \
-	$(lisp)/cedet/ede/proj-prog.el \
-	$(lisp)/cedet/ede/proj-scheme.el \
-	$(lisp)/cedet/ede/proj-shared.el \
-	$(lisp)/cedet/ede/proj.el \
-	$(lisp)/cedet/ede/project-am.el \
-	$(lisp)/cedet/ede/simple.el \
-	$(lisp)/cedet/ede/source.el \
-	$(lisp)/cedet/ede/speedbar.el \
-	$(lisp)/cedet/ede/srecode.el \
-	$(lisp)/cedet/ede/system.el \
-	$(lisp)/cedet/ede/util.el \
-	$(lisp)/cedet/semantic/analyze.el \
-	$(lisp)/cedet/semantic/bovine.el \
-	$(lisp)/cedet/semantic/chart.el \
-	$(lisp)/cedet/semantic/complete.el \
-	$(lisp)/cedet/semantic/ctxt.el \
-	$(lisp)/cedet/semantic/db-debug.el \
-	$(lisp)/cedet/semantic/db-ebrowse.el \
-	$(lisp)/cedet/semantic/db-el.el \
-	$(lisp)/cedet/semantic/db-file.el \
-	$(lisp)/cedet/semantic/db-find.el \
-	$(lisp)/cedet/semantic/db-global.el \
-	$(lisp)/cedet/semantic/db-javascript.el \
-	$(lisp)/cedet/semantic/db-mode.el \
-	$(lisp)/cedet/semantic/db-ref.el \
-	$(lisp)/cedet/semantic/db-typecache.el \
-	$(lisp)/cedet/semantic/db.el \
-	$(lisp)/cedet/semantic/debug.el \
-	$(lisp)/cedet/semantic/decorate.el \
-	$(lisp)/cedet/semantic/dep.el \
-	$(lisp)/cedet/semantic/doc.el \
-	$(lisp)/cedet/semantic/ede-grammar.el \
-	$(lisp)/cedet/semantic/edit.el \
-	$(lisp)/cedet/semantic/find.el \
-	$(lisp)/cedet/semantic/format.el \
-	$(lisp)/cedet/semantic/fw.el \
-	$(lisp)/cedet/semantic/grammar-wy.el \
-	$(lisp)/cedet/semantic/grammar.el \
-	$(lisp)/cedet/semantic/html.el \
-	$(lisp)/cedet/semantic/ia-sb.el \
-	$(lisp)/cedet/semantic/ia.el \
-	$(lisp)/cedet/semantic/idle.el \
-	$(lisp)/cedet/semantic/java.el \
-	$(lisp)/cedet/semantic/lex-spp.el \
-	$(lisp)/cedet/semantic/lex.el \
-	$(lisp)/cedet/semantic/mru-bookmark.el \
-	$(lisp)/cedet/semantic/sb.el \
-	$(lisp)/cedet/semantic/scope.el \
-	$(lisp)/cedet/semantic/senator.el \
-	$(lisp)/cedet/semantic/sort.el \
-	$(lisp)/cedet/semantic/symref.el \
-	$(lisp)/cedet/semantic/tag-file.el \
-	$(lisp)/cedet/semantic/tag-ls.el \
-	$(lisp)/cedet/semantic/tag-write.el \
-	$(lisp)/cedet/semantic/tag.el \
-	$(lisp)/cedet/semantic/texi.el \
-	$(lisp)/cedet/semantic/util-modes.el \
-	$(lisp)/cedet/semantic/util.el \
-	$(lisp)/cedet/semantic/wisent.el \
-	$(lisp)/cedet/semantic/analyze/complete.el \
-	$(lisp)/cedet/semantic/analyze/debug.el \
-	$(lisp)/cedet/semantic/analyze/fcn.el \
-	$(lisp)/cedet/semantic/analyze/refs.el \
-	$(lisp)/cedet/semantic/bovine/c-by.el \
-	$(lisp)/cedet/semantic/bovine/c.el \
-	$(lisp)/cedet/semantic/bovine/debug.el \
-	$(lisp)/cedet/semantic/bovine/el.el \
-	$(lisp)/cedet/semantic/bovine/gcc.el \
-	$(lisp)/cedet/semantic/bovine/make-by.el \
-	$(lisp)/cedet/semantic/bovine/make.el \
-	$(lisp)/cedet/semantic/bovine/scm-by.el \
-	$(lisp)/cedet/semantic/bovine/scm.el \
-	$(lisp)/cedet/semantic/decorate/include.el \
-	$(lisp)/cedet/semantic/decorate/mode.el \
-	$(lisp)/cedet/semantic/symref/cscope.el \
-	$(lisp)/cedet/semantic/symref/filter.el \
-	$(lisp)/cedet/semantic/symref/global.el \
-	$(lisp)/cedet/semantic/symref/grep.el \
-	$(lisp)/cedet/semantic/symref/idutils.el \
-	$(lisp)/cedet/semantic/symref/list.el \
-	$(lisp)/cedet/semantic/wisent/comp.el \
-	$(lisp)/cedet/semantic/wisent/java-tags.el \
-	$(lisp)/cedet/semantic/wisent/javascript.el \
-	$(lisp)/cedet/semantic/wisent/javat-wy.el \
-	$(lisp)/cedet/semantic/wisent/js-wy.el \
-	$(lisp)/cedet/semantic/wisent/wisent.el \
-	$(lisp)/cedet/srecode/args.el \
-	$(lisp)/cedet/srecode/compile.el \
-	$(lisp)/cedet/srecode/cpp.el \
-	$(lisp)/cedet/srecode/ctxt.el \
-	$(lisp)/cedet/srecode/dictionary.el \
-	$(lisp)/cedet/srecode/document.el \
-	$(lisp)/cedet/srecode/el.el \
-	$(lisp)/cedet/srecode/expandproto.el \
-	$(lisp)/cedet/srecode/extract.el \
-	$(lisp)/cedet/srecode/fields.el \
-	$(lisp)/cedet/srecode/filters.el \
-	$(lisp)/cedet/srecode/find.el \
-	$(lisp)/cedet/srecode/getset.el \
-	$(lisp)/cedet/srecode/insert.el \
-	$(lisp)/cedet/srecode/java.el \
-	$(lisp)/cedet/srecode/map.el \
-	$(lisp)/cedet/srecode/mode.el \
-	$(lisp)/cedet/srecode/semantic.el \
-	$(lisp)/cedet/srecode/srt-mode.el \
-	$(lisp)/cedet/srecode/srt-wy.el \
-	$(lisp)/cedet/srecode/srt.el \
-	$(lisp)/cedet/srecode/table.el \
-	$(lisp)/cedet/srecode/template.el \
-	$(lisp)/cedet/srecode/texi.el \
 	$(lisp)/cdl.elc \
+	$(lisp)/cedet/cedet-cscope.elc \
+	$(lisp)/cedet/cedet-files.elc \
+	$(lisp)/cedet/cedet-global.elc \
+	$(lisp)/cedet/cedet-idutils.elc \
+	$(lisp)/cedet/cedet.elc \
+	$(lisp)/cedet/data-debug.elc \
+	$(lisp)/cedet/ede.elc \
+	$(lisp)/cedet/ede/autoconf-edit.elc \
+	$(lisp)/cedet/ede/cpp-root.elc \
+	$(lisp)/cedet/ede/dired.elc \
+	$(lisp)/cedet/ede/emacs.elc \
+	$(lisp)/cedet/ede/files.elc \
+	$(lisp)/cedet/ede/linux.elc \
+	$(lisp)/cedet/ede/locate.elc \
+	$(lisp)/cedet/ede/make.elc \
+	$(lisp)/cedet/ede/makefile-edit.elc \
+	$(lisp)/cedet/ede/pconf.elc \
+	$(lisp)/cedet/ede/pmake.elc \
+	$(lisp)/cedet/ede/proj-archive.elc \
+	$(lisp)/cedet/ede/proj-aux.elc \
+	$(lisp)/cedet/ede/proj-comp.elc \
+	$(lisp)/cedet/ede/proj-elisp.elc \
+	$(lisp)/cedet/ede/proj-info.elc \
+	$(lisp)/cedet/ede/proj-misc.elc \
+	$(lisp)/cedet/ede/proj-obj.elc \
+	$(lisp)/cedet/ede/proj-prog.elc \
+	$(lisp)/cedet/ede/proj-scheme.elc \
+	$(lisp)/cedet/ede/proj-shared.elc \
+	$(lisp)/cedet/ede/proj.elc \
+	$(lisp)/cedet/ede/project-am.elc \
+	$(lisp)/cedet/ede/simple.elc \
+	$(lisp)/cedet/ede/source.elc \
+	$(lisp)/cedet/ede/speedbar.elc \
+	$(lisp)/cedet/ede/srecode.elc \
+	$(lisp)/cedet/ede/system.elc \
+	$(lisp)/cedet/ede/util.elc \
+	$(lisp)/cedet/inversion.elc \
+	$(lisp)/cedet/mode-local.elc \
+	$(lisp)/cedet/pulse.elc \
+	$(lisp)/cedet/semantic.elc \
+	$(lisp)/cedet/semantic/analyze.elc \
+	$(lisp)/cedet/semantic/bovine.elc \
+	$(lisp)/cedet/semantic/chart.elc \
+	$(lisp)/cedet/semantic/complete.elc \
+	$(lisp)/cedet/semantic/ctxt.elc \
+	$(lisp)/cedet/semantic/db-debug.elc \
+	$(lisp)/cedet/semantic/db-ebrowse.elc \
+	$(lisp)/cedet/semantic/db-el.elc \
+	$(lisp)/cedet/semantic/db-file.elc \
+	$(lisp)/cedet/semantic/db-find.elc \
+	$(lisp)/cedet/semantic/db-global.elc \
+	$(lisp)/cedet/semantic/db-javascript.elc \
+	$(lisp)/cedet/semantic/db-mode.elc \
+	$(lisp)/cedet/semantic/db-ref.elc \
+	$(lisp)/cedet/semantic/db-typecache.elc \
+	$(lisp)/cedet/semantic/db.elc \
+	$(lisp)/cedet/semantic/debug.elc \
+	$(lisp)/cedet/semantic/decorate.elc \
+	$(lisp)/cedet/semantic/dep.elc \
+	$(lisp)/cedet/semantic/doc.elc \
+	$(lisp)/cedet/semantic/ede-grammar.elc \
+	$(lisp)/cedet/semantic/edit.elc \
+	$(lisp)/cedet/semantic/find.elc \
+	$(lisp)/cedet/semantic/format.elc \
+	$(lisp)/cedet/semantic/fw.elc \
+	$(lisp)/cedet/semantic/grammar-wy.elc \
+	$(lisp)/cedet/semantic/grammar.elc \
+	$(lisp)/cedet/semantic/html.elc \
+	$(lisp)/cedet/semantic/ia-sb.elc \
+	$(lisp)/cedet/semantic/ia.elc \
+	$(lisp)/cedet/semantic/idle.elc \
+	$(lisp)/cedet/semantic/java.elc \
+	$(lisp)/cedet/semantic/lex-spp.elc \
+	$(lisp)/cedet/semantic/lex.elc \
+	$(lisp)/cedet/semantic/mru-bookmark.elc \
+	$(lisp)/cedet/semantic/sb.elc \
+	$(lisp)/cedet/semantic/scope.elc \
+	$(lisp)/cedet/semantic/senator.elc \
+	$(lisp)/cedet/semantic/sort.elc \
+	$(lisp)/cedet/semantic/symref.elc \
+	$(lisp)/cedet/semantic/tag-file.elc \
+	$(lisp)/cedet/semantic/tag-ls.elc \
+	$(lisp)/cedet/semantic/tag-write.elc \
+	$(lisp)/cedet/semantic/tag.elc \
+	$(lisp)/cedet/semantic/texi.elc \
+	$(lisp)/cedet/semantic/util-modes.elc \
+	$(lisp)/cedet/semantic/util.elc \
+	$(lisp)/cedet/semantic/wisent.elc \
+	$(lisp)/cedet/srecode.elc \
+	$(lisp)/cedet/srecode/args.elc \
+	$(lisp)/cedet/srecode/compile.elc \
+	$(lisp)/cedet/srecode/cpp.elc \
+	$(lisp)/cedet/srecode/ctxt.elc \
+	$(lisp)/cedet/srecode/dictionary.elc \
+	$(lisp)/cedet/srecode/document.elc \
+	$(lisp)/cedet/srecode/el.elc \
+	$(lisp)/cedet/srecode/expandproto.elc \
+	$(lisp)/cedet/srecode/extract.elc \
+	$(lisp)/cedet/srecode/fields.elc \
+	$(lisp)/cedet/srecode/filters.elc \
+	$(lisp)/cedet/srecode/find.elc \
+	$(lisp)/cedet/srecode/getset.elc \
+	$(lisp)/cedet/srecode/insert.elc \
+	$(lisp)/cedet/srecode/java.elc \
+	$(lisp)/cedet/srecode/map.elc \
+	$(lisp)/cedet/srecode/mode.elc \
+	$(lisp)/cedet/srecode/semantic.elc \
+	$(lisp)/cedet/srecode/srt-mode.elc \
+	$(lisp)/cedet/srecode/srt-wy.elc \
+	$(lisp)/cedet/srecode/srt.elc \
+	$(lisp)/cedet/srecode/table.elc \
+	$(lisp)/cedet/srecode/template.elc \
+	$(lisp)/cedet/srecode/texi.elc \
 	$(lisp)/chistory.elc \
 	$(lisp)/cmuscheme.elc \
 	$(lisp)/comint.elc \
@@ -515,13 +489,13 @@
 	$(lisp)/emacs-lisp/easy-mmode.elc \
 	$(lisp)/emacs-lisp/easymenu.elc \
 	$(lisp)/emacs-lisp/edebug.elc \
-	$(lisp)/emacs-lisp/eieio.elc \
 	$(lisp)/emacs-lisp/eieio-base.elc \
 	$(lisp)/emacs-lisp/eieio-comp.elc \
 	$(lisp)/emacs-lisp/eieio-custom.elc \
 	$(lisp)/emacs-lisp/eieio-datadebug.elc \
 	$(lisp)/emacs-lisp/eieio-opt.elc \
 	$(lisp)/emacs-lisp/eieio-speedbar.elc \
+	$(lisp)/emacs-lisp/eieio.elc \
 	$(lisp)/emacs-lisp/eldoc.elc \
 	$(lisp)/emacs-lisp/elint.elc \
 	$(lisp)/emacs-lisp/elp.elc \
@@ -663,8 +637,8 @@
 	$(lisp)/faces.elc \
 	$(lisp)/ffap.elc \
 	$(lisp)/filecache.elc \
+	$(lisp)/files-x.elc \
 	$(lisp)/files.elc \
-	$(lisp)/files-x.elc \
 	$(lisp)/filesets.elc \
 	$(lisp)/find-cmd.elc \
 	$(lisp)/find-dired.elc \
@@ -864,8 +838,8 @@
 	$(lisp)/international/quail.elc \
 	$(lisp)/international/robin.elc \
 	$(lisp)/international/titdic-cnv.elc \
+	$(lisp)/international/ucs-normalize.elc \
 	$(lisp)/international/utf-7.elc \
-	$(lisp)/international/ucs-normalize.elc \
 	$(lisp)/isearch.elc \
 	$(lisp)/isearchb.elc \
 	$(lisp)/iswitchb.elc \
@@ -995,8 +969,8 @@
 	$(lisp)/net/goto-addr.elc \
 	$(lisp)/net/hmac-def.elc \
 	$(lisp)/net/hmac-md5.elc \
+	$(lisp)/net/imap-hash.elc \
 	$(lisp)/net/imap.elc \
-	$(lisp)/net/imap-hash.elc \
 	$(lisp)/net/ldap.elc \
 	$(lisp)/net/mairix.elc \
 	$(lisp)/net/net-utils.elc \
@@ -1491,7 +1465,7 @@
 # unconditionally.  Some files don't actually get compiled because they
 # set the local variable no-byte-compile.
 compile-always: doit
-	cd $(lisp); rm -f *.elc */*.elc
+	cd $(lisp); rm -f *.elc */*.elc */*/*.elc
 	$(MAKE) $(MFLAGS) compile EMACS=$(EMACS)
 
 ## In case any files are missing from ELCFILES.
@@ -1521,7 +1495,7 @@
 
 backup-compiled-files:
 	-mv $(lisp)/elc.tar.gz $(lisp)/elc.tar.gz~
-	-tar czf $(lisp)/elc.tar.gz $(lisp)/*.elc $(lisp)/*/*.elc
+	-tar czf $(lisp)/elc.tar.gz $(lisp)/*.elc $(lisp)/*/*.elc $(lisp)/*/*/*.elc
 
 # Compile Lisp files, but save old compiled files first.
 
@@ -1619,7 +1593,7 @@
 # file, we don't want to store it in the source repository).
 
 bootstrap-clean:
-	cd $(lisp); rm -f *.elc */*.elc $(AUTOGENEL)
+	cd $(lisp); rm -f *.elc */*.elc */*/*.elc $(AUTOGENEL)
 
 distclean:
 	-rm -f ./Makefile