Make update_autogen handle loaddefs-like files as well.

* autogen/update_autogen: (usage): Add -l, -C.
(clean, ldefs_flag, ldefs_in, ldefs_out): New variables.
With -l, check status of lisp/ as well.
With -C, clean before building.
(autoreconf): Only pass -f in the `clean' case.
(commit): New function.

* lisp/Makefile.in (AUTOGEN_VCS): New variable.
(autoloads): Use $AUTOGEN_VCS.

* .bzrignore: Tighten up ignore patterns (for autogen/).

2 files changed, 17 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 072f35e528a..856cb05cb8c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-06  Glenn Morris  <rgm@gnu.org>
 
+        * Makefile.in (AUTOGEN_VCS): New variable.
+        (autoloads): Use $AUTOGEN_VCS.
+
         * calendar/cal-move.el (calendar-scroll-toolkit-scroll): New function.
         * calendar/calendar.el (calendar-mode-map):
         Check for toolkit scroll bars.  (Bug#8305)
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 083f312d613..d4ff6a4384b 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -70,6 +70,18 @@ AUTOGENEL = loaddefs.el \
         cedet/ede/loaddefs.el \
         cedet/srecode/loaddefs.el
 
+# Versioned files that are the value of someone's `generated-autoload-file'.
+# Note that update_loaddefs parses this.
+AUTOGEN_VCS = \
+        ps-print.el \
+        emulation/tpu-edt.el \
+        emacs-lisp/cl-loaddefs.el \
+        mail/rmail.el \
+        dired.el \
+        ibuffer.el \
+        htmlfontify.el \
+        emacs-lisp/eieio.el
+
 # Value of max-lisp-eval-depth when compiling initially.
 # During bootstrapping the byte-compiler is run interpreted when compiling
 # itself, and uses more stack than usual.
@@ -153,13 +165,9 @@ finder-data: doit
         echo Directories: $$wins; \
         $(emacs) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins
 
-# The chmod +w is to handle env var CVSREAD=1.  Files named
-# are identified by being the value of `generated-autoload-file'.
+# The chmod +w is to handle env var CVSREAD=1.
 autoloads: $(LOADDEFS) doit
-        chmod +w $(lisp)/ps-print.el $(lisp)/emulation/tpu-edt.el \
-          $(lisp)/emacs-lisp/cl-loaddefs.el $(lisp)/mail/rmail.el \
-          $(lisp)/dired.el $(lisp)/ibuffer.el $(lisp)/htmlfontify.el \
-          $(lisp)/emacs-lisp/eieio.el
+        cd $(lisp) && chmod +w $(AUTOGEN_VCS)
         cd $(lisp); $(setwins_almost); \
         echo Directories: $$wins; \
         $(emacs) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins