From 802c2338ccc412de968c3cc9cc96f73c7d650313 Mon Sep 17 00:00:00 2001
From: morioka <morioka>
Date: Mon, 2 Mar 1998 14:08:45 +0000
Subject: [PATCH] tm 5.21.7

---
 Makefile         |    4 ++--
 Makefile.bc      |    8 +++++---
 gnus/Makefile    |   36 +++++++++++++++++++++++-------------
 gnus/Makefile.bc |   35 +++++++++++------------------------
 gnus/tm-gnus3.el |    3 +--
 gnus/tm-gnus4.el |    3 +--
 6 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/Makefile b/Makefile
index 7ffc2e8..f2a6db9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.4 1995/01/13 00:13:17 morioka Exp $
+# $Id: Makefile,v 1.4 1995/01/13 00:13:17 morioka Exp morioka $
 #
 
 # Please specify emacs executables:
@@ -36,7 +36,7 @@ FILES	= tm/README.eng tm/Makefile tm/Makefile.bc \
 	tm/mh-e/Makefile tm/mh-e/Makefile.bc tm/mh-e/*.el \
 	tl/README.eng tl/Makefile tl/Makefile.bc tl/*.el tl/doc/*.texi
 
-TARFILE = tm5.21.6.tar
+TARFILE = tm5.21.7.tar
 
 
 nemacs:
diff --git a/Makefile.bc b/Makefile.bc
index 171c47b..dceec18 100644
--- a/Makefile.bc
+++ b/Makefile.bc
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.bc,v 1.1 1995/01/12 16:27:01 morioka Exp $
+# $Id: Makefile.bc,v 1.3 1995/01/13 02:59:07 morioka Exp $
 #
 
 TMMEL	= tm-view.el tm-rmail.el tm-comp.el
@@ -36,10 +36,12 @@ tm-misc.elc:	tm-misc.el
 		-f batch-byte-compile $<
 
 tm-$(EMACS_TYPE).elc:	tm-$(EMACS_TYPE).el
-	$(EMACS) -batch -q . -l $(TLSRCDIR)/tl-$(EMACS_TYPE).el \
+	$(EMACS) -batch -q . \
+		-l $(TLSRCDIR)/tl-list.el \
+		-l $(TLSRCDIR)/tl-$(EMACS_TYPE).el \
 		-f batch-byte-compile $<
 
-$(TMMELC):
+$(TMMELC):	$(TMMEL)
 	$(EMACS) -batch -q . \
 		-l $(TLSRCDIR)/tl-str.el -l $(TLSRCDIR)/tl-list.el \
 		-l $(TLSRCDIR)/tl-header.el \
diff --git a/gnus/Makefile b/gnus/Makefile
index 231c05c..c20085b 100644
--- a/gnus/Makefile
+++ b/gnus/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.3 1995/01/10 12:35:29 morioka Exp $
+# $Id: Makefile,v 1.4 1995/01/13 20:50:22 morioka Exp $
 #
 
 # Please specify emacs executables:
@@ -25,14 +25,24 @@
 	TLSRCDIR = ../../tl
 
 
-nemacs:
-	make -f Makefile.bc tm-gnus.elc \
-		EMACS=$(NEMACS) EMACS_TYPE=nemacs \
+nemacs-gnus3:
+	make -f Makefile.bc all \
+		EMACS=$(NEMACS) EMACS_TYPE=nemacs GNUS_TYPE=gnus3 \
 		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
 
-mule1:
-	make -f Makefile.bc tm-gnus.elc \
-		EMACS=$(MULE1) EMACS_TYPE=mule \
+nemacs-gnus4:
+	make -f Makefile.bc all \
+		EMACS=$(NEMACS) EMACS_TYPE=nemacs GNUS_TYPE=gnus4 \
+		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
+
+mule1-gnus3:
+	make -f Makefile.bc all \
+		EMACS=$(MULE1) EMACS_TYPE=mule GNUS_TYPE=gnus3 \
+		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
+
+mule1-gnus4:
+	make -f Makefile.bc all \
+		EMACS=$(MULE1) EMACS_TYPE=mule GNUS_TYPE=gnus4 \
 		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
 
 install-18:
@@ -42,18 +52,18 @@ install-18:
 
 
 orig19:
-	make -f Makefile.bc gnus4 \
-		EMACS=$(ORIG19) EMACS_TYPE=orig \
+	make -f Makefile.bc all \
+		EMACS=$(ORIG19) EMACS_TYPE=orig GNUS_TYPE=gnus4 \
 		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
 
 mule2:
-	make -f Makefile.bc gnus4 \
-		EMACS=$(MULE2) EMACS_TYPE=mule \
+	make -f Makefile.bc all \
+		EMACS=$(MULE2) EMACS_TYPE=mule GNUS_TYPE=gnus4 \
 		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
 
 install-19:
-	-chmod +w $(TMDIR19)/tm-gnus*.el
-	cp -p tm-gnus*.el $(TMDIR19)
+	-(cd $(TMDIR19); chmod +w tm-gnus.el tm-gnus4.el)
+	cp -p tm-gnus.el tm-gnus4.el $(TMDIR19)
 	mv tm-gnus*.elc $(TMDIR19)
 
 
diff --git a/gnus/Makefile.bc b/gnus/Makefile.bc
index 31fbd20..7ab7da2 100644
--- a/gnus/Makefile.bc
+++ b/gnus/Makefile.bc
@@ -1,35 +1,22 @@
 #
-# $Id: Makefile.bc,v 1.1 1995/01/10 12:05:54 morioka Exp $
+# $Id: Makefile.bc,v 1.2 1995/01/13 20:51:03 morioka Exp $
 #
 
 .SUFFIXES:	.el .elc
 
 .el.elc:
-	$(EMACS) -batch -q . -f batch-byte-compile $<
-
-
-gnus3:	tm-gnus.elc tm-gnus3.elc
-
-gnus4:	tm-gnus.elc tm-gnus4.elc
+	$(EMACS) -batch -q . \
+		-l $(TLDIR)/tl-str.el -l $(TLDIR)/tl-list.el \
+		-l $(TLDIR)/tl-header.el -l $(TLDIR)/tl-$(EMACS_TYPE).el \
+		-l $(TMDIR)/tm-$(EMACS_TYPE).el \
+		-l $(TMDIR)/tiny-mime.el -l $(TMDIR)/tm-misc.el \
+		-l $(TMDIR)/tm-view.el \
+		-l gnus -l tm-$(GNUS_TYPE).el -l tm-gnus.el \
+		-f batch-byte-compile $<
 
+all:	tm-gnus.elc tm-$(GNUS_TYPE).elc
 
 tm-gnus.elc:	tm-gnus.el
-	$(EMACS) -batch -q . -l $(TLDIR)/tl-str.el -l $(TLDIR)/tl-list.el \
-		-l $(TLDIR)/tl-header.el -l $(TLDIR)/tl-$(EMACS_TYPE).el \
-		-l $(TMDIR)/tm-$(EMACS_TYPE).el -l $(TMDIR)/tiny-mime.el \
-		-l $(TMDIR)/tm-misc.el -l gnus \
-		-f batch-byte-compile $<
 
-tm-gnus4.elc:	tm-gnus4.el
-	$(EMACS) -batch -q . -l $(TLDIR)/tl-str.el -l $(TLDIR)/tl-list.el \
-		-l $(TLDIR)/tl-header.el -l $(TLDIR)/tl-$(EMACS_TYPE).el \
-		-l $(TMDIR)/tm-$(EMACS_TYPE).el -l $(TMDIR)/tiny-mime.el \
-		-l $(TMDIR)/tm-misc.el -l gnus -l tm-gnus.el \
-		-f batch-byte-compile $<
+tm-$(GNUS_TYPE).elc:	tm-$(GNUS_TYPE).el
 
-tm-gnus3.elc:	tm-gnus3.el
-	$(EMACS) -batch -q . -l $(TLDIR)/tl-str.el -l $(TLDIR)/tl-list.el \
-		-l $(TLDIR)/tl-header.el -l $(TLDIR)/tl-$(EMACS_TYPE).el \
-		-l $(TMDIR)/tm-$(EMACS_TYPE).el -l $(TMDIR)/tiny-mime.el \
-		-l $(TMDIR)/tm-misc.el -l gnus -l tm-gnus.el \
-		-f batch-byte-compile $<
diff --git a/gnus/tm-gnus3.el b/gnus/tm-gnus3.el
index 38ef4a4..cc3db7c 100644
--- a/gnus/tm-gnus3.el
+++ b/gnus/tm-gnus3.el
@@ -1,10 +1,9 @@
 ;;;
-;;; $Id: tm-gnus3.el,v 5.4 1994/10/25 08:29:17 morioka Exp $
+;;; $Id: tm-gnus3.el,v 5.5 1995/01/13 20:46:48 morioka Exp $
 ;;;
 
 (provide 'tm-gnus3)
 
-(require 'tm-gnus)
 (require 'tm-view)
 (require 'tl-list)
 
diff --git a/gnus/tm-gnus4.el b/gnus/tm-gnus4.el
index 4a1f6de..76f61fb 100644
--- a/gnus/tm-gnus4.el
+++ b/gnus/tm-gnus4.el
@@ -1,10 +1,9 @@
 ;;;
-;;; $Id: tm-gnus4.el,v 5.4 1994/10/25 08:50:08 morioka Exp $
+;;; $Id: tm-gnus4.el,v 5.5 1995/01/13 20:48:16 morioka Exp $
 ;;;
 
 (provide 'tm-gnus4)
 
-(require 'tm-gnus)
 (autoload 'mime/viewer-mode "tm-view" "View MIME message." t)
 
 (defun tm-gnus/view-message (arg)
-- 
1.7.10.4