From fdfe47dd6b947b9f0e4b43c6d135794320a94f3e Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 26 Jan 2006 09:02:35 +0000 Subject: [PATCH] Synch to No Gnus 200601260901. --- ChangeLog | 13 +++++++++++++ Makefile.in | 6 ++---- etc/Makefile.in | 11 +++++++---- lisp/ChangeLog | 5 +++++ lisp/Makefile.in | 3 +-- lisp/dgnushack.el | 7 ++----- texi/ChangeLog | 7 +++++++ texi/Makefile.in | 12 ++++++------ 8 files changed, 43 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index f54c30c..d004f81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ +2006-01-26 Katsumi Yamaoka + + * Makefile.in (clean): Clean all subdirectories; remove *~. + (elclean): Remove lisp/gnus-load.el. + (distclean): Don't use sub-make to run clean; use $(MAKE) instead + of make. + + * etc/Makefile.in (clean): New rule. + (distclean): Use it. + 2005-01-26 Katsumi Yamaoka + * lisp/dgnushack.el (dgnushack-unexporting-files): Exclude + dgnuskwds.el, legacy-gnus-agent.el and gnus-load.el. + * lisp/nnheader.el (mm-subst-char-in-string): New function. (nnheader-replace-chars-in-string): Use it. diff --git a/Makefile.in b/Makefile.in index 24634d8..54cfddb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -200,9 +200,8 @@ info-ja: cd texi && $(MAKE) EMACS=$(EMACS) ja clean: - rm -f */*.orig */*.rej *.orig *.rej - rm -f MANIFEST.* - for i in lisp texi; do (cd $$i; $(MAKE) clean); done + for i in lisp texi etc texi/ps; do (cd $$i; $(MAKE) clean); done + rm -f *.orig *.rej *~ MANIFEST.* elclean: cd lisp && rm -f *.elc auto-autoloads.el custom-load.el gnus-load.el @@ -214,7 +213,6 @@ xsome: $(MAKE) EMACS="$(XEMACS)" some distclean: clean - rm -rf *~ for i in lisp texi etc texi/ps; do (cd $$i; $(MAKE) distclean); done rm -f config.log config.status config.cache Makefile diff --git a/etc/Makefile.in b/etc/Makefile.in index 517bfad..db088c8 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -13,7 +13,7 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ SHELL = /bin/sh -install: +install: $(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir) cd $(srcdir) \ && for p in gnus-tut.txt; do \ @@ -33,7 +33,7 @@ install: $(INSTALL_DATA) $$p $(etcdir)/$$p; \ done -uninstall: +uninstall: rm -f $(etcdir)/gnus-tut.txt cd $(srcdir) \ && for p in images/gnus/*.xpm images/gnus/*.pbm images/gnus/*.xbm images/gnus/x-splash; do \ @@ -51,8 +51,11 @@ Makefile: $(srcdir)/Makefile.in ../config.status cd .. \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -distclean: - rm -f *~ Makefile +clean: + rm -f *~ + +distclean: clean + Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5a64668..62c5a1f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-01-26 Katsumi Yamaoka + + * Makefile.in (clean): New rule. + (distclean): Use it. + 2006-01-26 Steve Youngs * gmm-utils.el (gmm-tool-bar-item, gmm-tool-bar-zap-list): Don't diff --git a/lisp/Makefile.in b/lisp/Makefile.in index a4906ca..c931170 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -107,8 +107,7 @@ gnus-load.el: $(EMACS_COMP) -f dgnushack-make-load clean: - rm -f *.orig *.rej *.elc *~ \ - auto-autoloads.el custom-load.el gnus-load.el dgnuskwds.el + rm -f *.elc *.orig *.rej *~ auto-autoloads.* custom-load.* gnus-load.el distclean: clean rm -f Makefile dgnuspath.el diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el index 1eefbaf..30da845 100644 --- a/lisp/dgnushack.el +++ b/lisp/dgnushack.el @@ -367,8 +367,7 @@ adding the --with-addpath=FLIM_PATH option.\n" (autoload 'std11-unfold-region "nnheader")) (defconst dgnushack-unexporting-files - (append '("dgnushack.el" "dgnuspath.el" "dgnuskwds.el" "lpath.el" - "legacy-gnus-agent.el") + (append '("dgnushack.el" "dgnuspath.el" "lpath.el") (unless (or (condition-case code (require 'w3-parse) (error @@ -429,9 +428,7 @@ adding the --with-addpath=FLIM_PATH option.\n" (subrp (symbol-function 'base64-decode-string))) '("base64.el")) (when (and (fboundp 'md5) (subrp (symbol-function 'md5))) - '("md5.el")) - (when (featurep 'xemacs) - '("gnus-load.el"))) + '("md5.el"))) "Files which will not be installed.") (defconst dgnushack-exporting-files diff --git a/texi/ChangeLog b/texi/ChangeLog index cdd80c1..ec855ce 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,10 @@ +2006-01-26 Katsumi Yamaoka + + * Makefile.in (almost-clean): Rename from clean. + (clean): Rename from veryclean. + (distclean): Use clean. + (pspackage): Use almost-clean. + 2006-01-16 Katsumi Yamaoka * gnus.texi: Update copyright. diff --git a/texi/Makefile.in b/texi/Makefile.in index b59c320..7ee865f 100644 --- a/texi/Makefile.in +++ b/texi/Makefile.in @@ -132,9 +132,9 @@ gnus-booklet.pdf: $(REFCARD).tex $(LOGO).pdf TEXINPUTS=$(srcdir):$$TEXINPUTS:: \ $(PDFLATEX) '\def\booklettrue{}\def\letterpapertrue{}\input{$(REFCARD)}' ;\ fi - mv $(REFCARD).pdf $@ + mv $(REFCARD).pdf $@ -gnus-faq-full-update: gnus-faq-clean gnus-faq-texi +gnus-faq-full-update: gnus-faq-clean gnus-faq-texi gnus-faq.xml: cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/gnus \ @@ -153,7 +153,7 @@ gnus-faq-texi: gnus-faq.xml xml2texi.sh xml2texi.scm gnus-faq-clean: rm -f gnus-faq.xml gnus-faq.*.tmp gnus-faq.texi -clean: +almost-clean: rm -f *.[cgk]idx *.aux *.cp *.cps *.dvi *.dvi-x *.fn *.ky \ *.kys *.latexi *.log *.orig *.pdf *.pdf-x *.pg *.rej \ *.tmplatexi *.toc *.tp *.vr gnus.*.bak gnus.[cgk]ind gnus.idx \ @@ -244,11 +244,11 @@ latexboth: gnus-manual-a4.ps.gz gnus-manual-standard.ps.gz out: scp gnus-manual-*.ps.gz gnus-manual-*.pdf www@quimby:html/gnus/documents -veryclean: clean +clean: almost-clean rm -f gnus.dvi gnus.ps texi2latex.elc rm -f gnus-manual-a4.* gnus-manual-standard.* -distclean: veryclean +distclean: clean rm -f *.orig *.rej *.elc *~ gnus-[0-9] gnus-[0-9][0-9] Makefile rm -f message-[0-9] rm -f $(INFO_DEPS) @@ -322,7 +322,7 @@ tmps: a="h"; echo -n "\\gnussmiley{$$i}"; fi done > smiley.tex; \ if [ -n "$$a" ]; then echo "{$$i}" >> smiley.tex; fi pspackage: - cd ps; make clean + cd ps; make almost-clean tar czvf pspackage.tar.gz gnus-faq.texi gnus.texi herds misc pagestyle.sty picons pixidx.sty postamble.tex ps screen smilies splitindex texi2latex.el xface Makefile README etc Makefile: $(srcdir)/Makefile.in ../config.status -- 1.7.10.4