From 3dc94c3075a2a08cc7bb697efb4de1fe0e7aa387 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Wed, 9 Apr 2008 16:26:54 +0000 Subject: [PATCH] (LOADDEFS): Add mh-loaddefs.el. ($(lisp)/mh-e/mh-loaddefs.el): Simplify rule. (pre-mh-loaddefs.el-CMD, pre-mh-loaddefs.el-SH): Remove. (AUTOGENEL): New variable. (distclean, maintainer-clean): New targets. --- lisp/ChangeLog | 8 ++++++ lisp/makefile.w32-in | 61 ++++++++++++-------------------------------- src/ChangeLog | 3 +++ 3 files changed, 27 insertions(+), 45 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3937cf6002d..bbee9e3e715 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2008-04-09 Jason Rumney + + * makefile.w32-in (LOADDEFS): Add mh-loaddefs.el. + ($(lisp)/mh-e/mh-loaddefs.el): Simplify rule. + (pre-mh-loaddefs.el-CMD, pre-mh-loaddefs.el-SH): Remove. + (AUTOGENEL): New variable. + (distclean, maintainer-clean): New targets. + 2008-04-09 Chong Yidong * emacs-lisp/regexp-opt.el (regexp-opt): Reduce diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index 55a8fecaf2d..f2a8111f99d 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -58,7 +58,11 @@ ETAGS = "../lib-src/$(BLD)/etags" # Automatically generated autoload files, apart from lisp/loaddefs.el. LOADDEFS = $(lisp)/calendar/cal-loaddefs.el \ - $(lisp)/calendar/diary-loaddefs.el $(lisp)/calendar/hol-loaddefs.el + $(lisp)/calendar/diary-loaddefs.el $(lisp)/calendar/hol-loaddefs.el \ + $(lisp)/mh-e/mh-loaddefs.el + +AUTOGENEL = $(lisp)/loaddefs.el $(LOADDEFS) $(lisp)/cus-load.el \ + $(lisp)/finder-inf.el $(lisp)/subdirs.el $(lisp)/eshell/esh-groups.el # Files to compile before others during a bootstrap. This is done to # speed up the bootstrap process. The CC files are compiled first @@ -360,52 +364,13 @@ MH_E_SRC = $(lisp)/mh-e/mh-acros.el $(lisp)/mh-e/mh-alias.el \ # instead of $(lisp)/mh-e. mh-autoloads: $(lisp)/mh-e/mh-loaddefs.el $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC) - $(MAKE) $(MFLAGS) pre-mh-loaddefs.el-$(SHELLTYPE) - cp pre-mh-loaddefs.el-$(SHELLTYPE) $@ - rm pre-mh-loaddefs.el-$(SHELLTYPE) "$(EMACS)" $(EMACSOPT) \ -l autoload \ - --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \ - --eval "(setq find-file-suppress-same-file-warnings t)" \ - --eval "(setq make-backup-files nil)" \ + --eval $(ARGQUOTE)(setq generate-autoload-cookie $(DQUOTE);;;###mh-autoload$(DQUOTE))$(ARGQUOTE) \ + --eval $(ARGQUOTE)(setq find-file-suppress-same-file-warnings t)$(ARGQUOTE) \ + --eval $(ARGQUOTE)(setq make-backup-files nil)$(ARGQUOTE) \ -f w32-batch-update-autoloads \ - "$(lisp)/mh-e/mh-loaddefs.el" ./mh-e - -pre-mh-loaddefs.el-SH: - echo ";;; mh-loaddefs.el --- automatically extracted autoloads" > $@ - echo ";;" >> $@ - echo ";; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc." >> $@ - echo ";; Author: Bill Wohler " >> $@ - echo ";; Keywords: mail" >> $@ - echo ";;; Commentary:" >> $@ - echo ";;; Change Log:" >> $@ - echo ";;; Code:" >> $@ - echo " " >> $@ - echo "(provide 'mh-loaddefs)" >> $@ - echo ";; Local Variables:" >> $@ - echo ";; version-control: never" >> $@ - echo ";; no-byte-compile: t" >> $@ - echo ";; no-update-autoloads: t" >> $@ - echo ";; End:" >> $@ - echo ";;; mh-loaddefs.el ends here" >> $@ - -pre-mh-loaddefs.el-CMD: - echo ;;; mh-loaddefs.el --- automatically extracted autoloads> $@ - echo ;;>> $@ - echo ;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.>> $@ - echo ;; Author: Bill Wohler (wohler@newt.com)>> $@ - echo ;; Keywords: mail>> $@ - echo ;;; Commentary:>> $@ - echo ;;; Change Log:>> $@ - echo ;;; Code:>> $@ - echo. >> $@ - echo (provide 'mh-loaddefs)>> $@ - echo ;; Local Variables:>> $@ - echo ;; version-control: never>> $@ - echo ;; no-byte-compile: t>> $@ - echo ;; no-update-autoloads: t>> $@ - echo ;; End:>> $@ - echo ;;; mh-loaddefs.el ends here>> $@ + $(ARGQUOTE)$(lisp)/mh-e/mh-loaddefs.el$(ARGQUOTE) ./mh-e # Prepare a bootstrap in the lisp subdirectory. # @@ -498,4 +463,10 @@ check-declare: # We used to delete *~ here, but that might inadvertently remove # precious files if it happens to match their short 8+3 aliases. clean: - - $(DEL) *.el~ + - $(DEL) *.el~ + +distclean: + - $(DEL) $(lisp)/Makefile + +maintainer-clean: bootstrap-clean distclean + - $(DEL) $(AUTOGENEL) diff --git a/src/ChangeLog b/src/ChangeLog index ddb0155f7f6..fc7b1404a41 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -4,6 +4,9 @@ 2008-04-09 Jason Rumney + * makefile.w32-in (distclean): Delete makefile too. + (maintainer-clean): New target. + * xdisp.c (redisplay_internal) [!WINDOWSNT]: Conditionalize last change. * w32term.c (w32_compute_glyph_string_overhangs): Compute overhangs -- 2.39.5