Mercurial > emacs
changeset 93656:0f802f448fc9
(cal-autoloads): New target.
(compile, compile-always, recompile): Depend on it.
($(lisp)/calendar/cal-loaddefs.el)
($(lisp)/calendar/diary-loaddefs.el)
($(lisp)/calendar/hol-loaddefs.el): Depend on calendar/*.el.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Fri, 04 Apr 2008 11:02:18 +0000 |
| parents | 83b8a1d075f3 |
| children | c6cad0a1a68b |
| files | lisp/ChangeLog lisp/Makefile.in |
| diffstat | 2 files changed, 25 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Apr 04 07:59:20 2008 +0000 +++ b/lisp/ChangeLog Fri Apr 04 11:02:18 2008 +0000 @@ -1,16 +1,24 @@ +2008-04-04 Andreas Schwab <schwab@suse.de> + + * Makefile.in (cal-autoloads): New target. + (compile, compile-always, recompile): Depend on it. + ($(lisp)/calendar/cal-loaddefs.el) + ($(lisp)/calendar/diary-loaddefs.el) + ($(lisp)/calendar/hol-loaddefs.el): Depend on calendar/*.el. + 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu> - + * ediff*el: replaced load with require in eval-when-compile. - + * ediff-hook: deleted all invocations of (autoload ...). - + * ediff-util.el (ediff-setup): make window-min-height a local variable in ediff control window, and set its min height to 2. (ediff-setup-control-buffer): dedicate the control window. (ediff-toggle-multiframe): undedicate control window. Work directly with ediff-setup-windows-multiframe and ediff-setup-windows-plain. - + * ediff-wind (ediff-choose-window-setup-function-automatically): new function. (ediff-window-setup-function): change initialization. @@ -18,13 +26,13 @@ (ediff-setup-windows-plain-merge): make control window dedicated. (ediff-destroy-control-frame): do not skip frames if working in a single frame. - + * emulation/viper-ex.el: move provide's forward, prevent recursion in eval-when-compile. - + * emulation/viper-util.el: move provide's forward, prevent recursion in eval-when-compile. - + 2008-04-04 Glenn Morris <rgm@gnu.org> * calendar/cal-bahai.el (calendar-bahai-to-absolute): Rename
--- a/lisp/Makefile.in Fri Apr 04 07:59:20 2008 +0000 +++ b/lisp/Makefile.in Fri Apr 04 11:02:18 2008 +0000 @@ -162,7 +162,7 @@ # `|| true' below prevents old Bash versions from getting confused # by an error. -compile: $(lisp)/subdirs.el mh-autoloads doit +compile: $(lisp)/subdirs.el mh-autoloads cal-autoloads doit find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1 || true; \ wd=$(lisp); $(setwins); \ els=`echo $$wins | tr ' \011' '\012\012' | \ @@ -179,7 +179,7 @@ # unconditionally. Some files don't actually get compiled because they # set the local variable no-byte-compile. -compile-always: $(lisp)/subdirs.el mh-autoloads doit +compile-always: $(lisp)/subdirs.el mh-autoloads cal-autoloads doit # `|| true' prevents old Bash versions from getting confused # by an error. find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1 || true; \ @@ -214,7 +214,7 @@ # Recompile all Lisp files which are newer than their .elc files and compile # new ones. -recompile: doit mh-autoloads $(lisp)/progmodes/cc-mode.elc +recompile: doit mh-autoloads cal-autoloads $(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 @@ -250,21 +250,25 @@ --eval "(setq make-backup-files nil)" \ -f batch-update-autoloads $(lisp)/mh-e -$(lisp)/calendar/cal-loaddefs.el: +cal-autoloads: $(lisp)/calendar/cal-loaddefs.el \ + $(lisp)/calendar/diary-loaddefs.el \ + $(lisp)/calendar/hol-loaddefs.el + +$(lisp)/calendar/cal-loaddefs.el: $(lisp)/calendar/*.el $(emacs) -l autoload \ --eval "(setq generate-autoload-cookie \";;;###cal-autoload\")" \ --eval "(setq generated-autoload-file \"$@\")" \ --eval "(setq make-backup-files nil)" \ -f batch-update-autoloads $(lisp)/calendar -$(lisp)/calendar/diary-loaddefs.el: +$(lisp)/calendar/diary-loaddefs.el: $(lisp)/calendar/*.el $(emacs) -l autoload \ --eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \ --eval "(setq generated-autoload-file \"$@\")" \ --eval "(setq make-backup-files nil)" \ -f batch-update-autoloads $(lisp)/calendar -$(lisp)/calendar/hol-loaddefs.el: +$(lisp)/calendar/hol-loaddefs.el: $(lisp)/calendar/*.el $(emacs) -l autoload \ --eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \ --eval "(setq generated-autoload-file \"$@\")" \