* lisp/Makefile.in (clever): Change the quoting style for the elisp

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

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 4408bca..424ad15 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -13,27 +13,29 @@ SHELL = /bin/sh
 VPATH = @srcdir@
 PACKAGEDIR = @PACKAGEDIR@
 W3DIR = @W3@
+URLDIR = @URL@
+EMACS_COMP = URLDIR=$(URLDIR) W3DIR=$(W3DIR) lispdir=$(lispdir) srcdir=$(srcdir) $(EMACS) $(FLAGS)
 GNUS_PRODUCT_NAME = @GNUS_PRODUCT_NAME@
-EXPORTING_FILES = $(EMACS) $(FLAGS) -f dgnushack-exporting-files 2>/dev/null
+EXPORTING_FILES = $(EMACS_COMP) -f dgnushack-exporting-files 2>/dev/null
 
-all total:
-       rm -f *.elc auto-autoloads.el custom-load.el
-       W3DIR=$(W3DIR) lispdir=$(lispdir) \
-               srcdir=$(srcdir) $(EMACS) $(FLAGS) -f dgnushack-compile
+all total: clean-some gnus-load.elc
+       $(EMACS_COMP) -f dgnushack-compile
 
-warn:
-       rm -f *.elc
-       W3DIR=$(W3DIR) lispdir=$(lispdir) srcdir=$(srcdir) $(EMACS) $(FLAGS) --eval '(dgnushack-compile t)' 2>&1 | egrep -v "variable G|inhibit-point-motion-hooks|coding-system|temp-results|variable gnus|variable nn|scroll-in-place|deactivate-mark|filladapt-mode|byte-code-function-p|print-quoted|ps-right-header|ps-left-header|article-inhibit|print-escape|ssl-program-arguments|message-log-max"
+clean-some:
+       rm -f *.elc gnus-load.el
+
+warn: clean-some gnus-load.elc
+       $(EMACS_COMP) --eval '(dgnushack-compile t)' 2>&1 | egrep -v "variable G|inhibit-point-motion-hooks|coding-system|temp-results|variable gnus|variable nn|scroll-in-place|deactivate-mark|filladapt-mode|byte-code-function-p|print-quoted|ps-right-header|ps-left-header|article-inhibit|print-escape|ssl-program-arguments|message-log-max"
 
 # The "clever" rule is unsafe, since redefined macros are loaded from
 # .elc files, and not the .el file.
-clever some:
+clever some: gnus-load.elc
        @if test -f $(srcdir)/gnus.elc; then \
          echo \
-           "checking for whether the all elc files should be recompiled..."; \
+           "checking whether the all elc files should be recompiled..."; \
          RM_ELC=nil; \
          if test `$(EMACS) -batch -q -no-site-file \
-               -eval "(princ (format \"%s\" (featurep (quote xemacs))))" \
+               -eval '(prin1 (featurep (quote xemacs)))' \
                2>/dev/null` = t; then \
            test ! -f $(srcdir)/gnus-xmas.elc && RM_ELC=t; \
          else \
@@ -47,8 +49,7 @@ clever some:
            echo " => maybe unnecessary"; \
          fi; \
        fi
-       W3DIR=$(W3DIR) lispdir=$(lispdir) \
-               srcdir=$(srcdir) $(EMACS) $(FLAGS) -f dgnushack-compile
+       $(EMACS_COMP) -f dgnushack-compile
 
 install: clever install-without-compiling
 
@@ -65,16 +66,14 @@ install-without-compiling:
 
 # Rule for XEmacs package.
 install-package-manifest:
-       srcdir=$(srcdir) $(EMACS) $(FLAGS) \
-               -f dgnushack-install-package-manifest \
+       $(EMACS_COMP) -f dgnushack-install-package-manifest \
                $(PACKAGEDIR) $(GNUS_PRODUCT_NAME)
 
-compose-package:
-       srcdir=$(srcdir) $(EMACS) $(FLAGS) -f dgnushack-make-autoloads
+compose-package: gnus-load.elc
+       $(EMACS_COMP) -f dgnushack-compose-package
 
 remove-extra-files-in-package:
-       srcdir=$(srcdir) $(EMACS) $(FLAGS) \
-               -f dgnushack-remove-extra-files-in-package \
+       $(EMACS_COMP) -f dgnushack-remove-extra-files-in-package \
                $(PACKAGEDIR) $(GNUS_PRODUCT_NAME)
 #
 
@@ -95,21 +94,14 @@ separately:
 pot:
        xpot -drgnus -r`cat ./version` *.el > rgnus.pot
 
-gnus-load.el:
-       echo ";;; gnus-load.el --- automatically extracted custom dependencies" > gnus-load.el
-       echo ";;" >> gnus-load.el
-       echo ";;; Code:" >> gnus-load.el
-       echo >> gnus-load.el
-       $(EMACS)  $(FLAGS) -l ./dgnushack.el -l cus-edit.el *.el \
-               -f custom-make-dependencies >> gnus-load.el
-       echo >> gnus-load.el
-       echo "(provide 'gnus-load)" >> gnus-load.el
-       echo >> gnus-load.el
-       echo ";;; gnus-load.el ends here" >> gnus-load.el
+gnus-load.elc:
+       $(EMACS_COMP) -f dgnushack-make-cus-load $(srcdir)
+       $(EMACS_COMP) -f dgnushack-make-auto-load $(srcdir)
+       $(EMACS_COMP) -f dgnushack-make-load
 
 clean:
-       rm -f *.orig *.rej *.elc *~
-       rm -f auto-autoloads.el custom-load.el
+       rm -f *.orig *.rej *.elc *~ \
+               auto-autoloads.el custom-load.el gnus-load.el dgnuskwds.el
 
 distclean: clean
        rm -f Makefile dgnuspath.el