[nongnu] elpa/orgit e18d3bb059 6/7: make: Improve creation of autoloads file

[ELPA Syncer]

branch: elpa/orgit
commit e18d3bb0592ee767255c167d03ea23723cf6e143
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    make: Improve creation of autoloads file
---
 Makefile | 40 +++++++++++++---------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile
index 00cb06fc4d..7a4932797d 100644
--- a/Makefile
+++ b/Makefile
@@ -37,33 +37,19 @@ loaddefs: $(PKG)-autoloads.el
 CLEAN  = $(ELCS) $(PKG)-autoloads.el
 
 clean:
-       @printf "Cleaning...\n"
+       @printf " Cleaning...\n"
        @rm -rf $(CLEAN)
 
-define LOADDEFS_TMPL
-;;; $(PKG)-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (directory-file-name \
-(or (file-name-directory #$$) (car load-path))))
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; $(PKG)-autoloads.el ends here
-endef
-export LOADDEFS_TMPL
-#'
-
 $(PKG)-autoloads.el: $(ELS)
-       @printf "Generating $@\n"
-       @printf "%s" "$$LOADDEFS_TMPL" > $@
-       @$(EMACS) -Q --batch --eval "(progn\
-       (setq make-backup-files nil)\
-       (setq vc-handled-backends nil)\
-       (setq default-directory (file-truename default-directory))\
-       (setq generated-autoload-file (expand-file-name \"$@\"))\
-       (setq find-file-visit-truename t)\
-       (update-directory-autoloads default-directory))"
+       @printf " Creating $@\n"
+       @$(EMACS) -Q --batch -l autoload -l cl-lib --eval "\
+(let ((file (expand-file-name \"$@\"))\
+      (autoload-timestamps nil) \
+      (backup-inhibited t)\
+      (version-control 'never)\
+      (coding-system-for-write 'utf-8-emacs-unix))\
+  (write-region (autoload-rubric file \"package\" nil) nil file nil 'silent)\
+  (cl-letf (((symbol-function 'progress-reporter-do-update) (lambda (&rest 
_)))\
+            ((symbol-function 'progress-reporter-done) (lambda (_))))\
+    (let ((generated-autoload-file file))\
+      (update-directory-autoloads default-directory))))"