Update.

[elisp/gnus.git-] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 42944e3..f0c8650 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,39 +15,53 @@ all-ja: lick info info-ja
 lick:
        cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" all
 
-install:
+install: install-lisp install-info
+
+install-ja: install install-info-ja
+
+install-lisp:
        cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" install
+
+install-info:
        cd texi && $(MAKE) EMACS="$(EMACS)" install
 
-# Rule for XEmacs package.
-package: xlick add-info-suffix xinfo remove-info-suffix
-       cd lisp && $(MAKE) EMACS="$(XEMACS)" package
+install-info-ja:
+       cd texi && $(MAKE) EMACS="$(EMACS)" install-ja
+
+## Rule for XEmacs package.
+install-package: xlick install-package-lick xinfo install-package-info
+
+install-package-ja: install-package xinfo-ja install-package-info-ja
 
-install-package: add-info-suffix xinfo xinfo remove-info-suffix
+package: xlick xinfo compose-package
+
+package-ja: xlick xinfo xinfo-ja compose-package
+
+# Sub-rule for XEmacs package.
+install-package-lick:
        cd lisp && $(MAKE) EMACS="$(XEMACS)" PACKAGEDIR="$(PACKAGEDIR)" \
-               install-package
+               install-package-lick
 
-package-ja: xlick add-info-suffix xinfo xinfo-ja remove-info-suffix
-       cd lisp && $(MAKE) EMACS="$(XEMACS)" package
+install-package-info:
+       cd lisp && $(MAKE) EMACS="$(XEMACS)" PACKAGEDIR="$(PACKAGEDIR)" \
+               install-package-info
 
-install-package-ja: add-info-suffix xinfo xinfo-ja remove-info-suffix
+install-package-info-ja:
        cd lisp && $(MAKE) EMACS="$(XEMACS)" PACKAGEDIR="$(PACKAGEDIR)" \
-               install-package
+               install-package-info-ja
+
+compose-package:
+       cd lisp && $(MAKE) EMACS="$(XEMACS)" compose-package
+##
 
 xlick:
        cd lisp && $(MAKE) EMACS="$(XEMACS)" lispdir="$(lispdir)" all
 
 xinfo:
-       cd texi && $(MAKE) EMACS="$(XEMACS)" all
+       cd texi && $(MAKE) EMACS="$(XEMACS)" all-info
 
 xinfo-ja:
-       cd texi && $(MAKE) EMACS="$(XEMACS)" MAKEINFO=no ja
-
-add-info-suffix:
-       cd texi && $(MAKE) EMACS="$(XEMACS)" add-info-suffix
-
-remove-info-suffix:
-       cd texi && $(MAKE) remove-info-suffix
+       cd texi && $(MAKE) EMACS="$(XEMACS)" ja-info
 
 # Rule for Lars and nobody else.
 some:
@@ -59,30 +73,27 @@ info:
        cd texi && $(MAKE) EMACS="$(EMACS)" all
 
 info-ja:
-       cd texi && $(MAKE) EMACS=$(EMACS) MAKEINFO=no 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
 
-xsome:
-       cd lisp && $(MAKE) EMACS="$(XEMACS)" some
-
 elclean:
        cd lisp && rm -f *.elc auto-autoloads.el custom-load.el
 
 x:
        $(MAKE) EMACS="$(XEMACS)"
 
+xsome:
+       $(MAKE) EMACS="$(XEMACS)" some
+
 distclean: clean
        rm -rf *~
        for i in lisp texi; do (cd $$i; $(MAKE) distclean); done
        rm -f config.log config.status config.cache Makefile
 
-osome:
-       $(MAKE) EMACS="$(XEMACS)" some
-
 config.status: $(srcdir)/configure
        $(SHELL) ./config.status --recheck
 $(srcdir)/configure: $(srcdir)/configure.in