Tweak japanese.el's loading of dependencies.

* lisp/loadup.el: Explicitly load cp51932 and eucjp-ms.
* lisp/language/japanese.el: Use require rather than load.
* lisp/international/cp51932.el, lisp/international/eucjp-ms.el:
Provide a feature.
* admin/charsets/eucjp-ms.awk, admin/charsets/cp51932.awk:
Provide a feature in the generated file.

admin/charsets/cp51932.awk

@@ -52,4 +52,6 @@ END {
   print "	      (setcar x (cdr x)) (setcdr x tmp)))";
   print "	map)";
   print "  (define-translation-table 'cp51932-encode map))";
+  print "";
+  print "(provide 'cp51932)";
 }

admin/charsets/eucjp-ms.awk

@@ -106,5 +106,7 @@ END {
   print "	      (setcar x (cdr x)) (setcdr x tmp)))";
   print "	map)";
   print "  (define-translation-table 'eucjp-ms-encode map))";
+  print "";
+  print "(provide 'eucjp-ms)";
 }
 

lisp/international/cp51932.el

@@ -468,3 +468,5 @@
 	      (setcar x (cdr x)) (setcdr x tmp)))
 	map)
   (define-translation-table 'cp51932-encode map))
+
+(provide 'cp51932)

lisp/international/eucjp-ms.el

@@ -2085,3 +2085,5 @@
 	      (setcar x (cdr x)) (setcdr x tmp)))
 	map)
   (define-translation-table 'eucjp-ms-encode map))
+
+(provide 'eucjp-ms)

lisp/language/japanese.el

@@ -34,8 +34,8 @@
 ;;; Code:
 
 ;;; Load translation tables for CP932.
-(load "international/cp51932")
-(load "international/eucjp-ms")
+(require 'cp51932)
+(require 'eucjp-ms)
 
 (define-coding-system 'iso-2022-jp
   "ISO 2022 based 7bit encoding for Japanese (MIME:ISO-2022-JP)."

lisp/loadup.el

@@ -178,6 +178,8 @@
 (load "language/romanian")
 (load "language/greek")
 (load "language/hebrew")
+(load "international/cp51932")
+(load "international/eucjp-ms")
 (load "language/japanese")
 (load "language/korean")
 (load "language/lao")

src/lisp.mk

@@ -34,10 +34,6 @@
 ## that does not have an explicit .el extension, but beware of any
 ## no-byte-compile ones.
 
-## Confusingly, international/cp51932 and international/eucjp-ms are
-## unconditionally loaded from language/japanese, instead of being
-## loaded directly from loadup.el; FIXME.
-
 ## Note that this list should not include lisp files which might not
 ## be present, like site-load.el and site-init.el; this makefile
 ## expects them all to be either present or buildable.
@@ -96,9 +92,9 @@ lisp = \
 	$(lispsource)/language/romanian.elc \
 	$(lispsource)/language/greek.elc \
 	$(lispsource)/language/hebrew.elc \
-	$(lispsource)/language/japanese.elc \
 	$(lispsource)/international/cp51932.el \
 	$(lispsource)/international/eucjp-ms.el \
+	$(lispsource)/language/japanese.elc \
 	$(lispsource)/language/korean.elc \
 	$(lispsource)/language/lao.elc \
 	$(lispsource)/language/tai-viet.elc \