[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master e5ce357 1/4: * GNUmakefile: Fix autoloads generation for a
From: |
Stefan Monnier |
Subject: |
[elpa] master e5ce357 1/4: * GNUmakefile: Fix autoloads generation for aggressive-indent |
Date: |
Sat, 28 Mar 2015 20:30:11 +0000 |
branch: master
commit e5ce35751236d77c15904e0f8f0f816ba8b517f8
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
* GNUmakefile: Fix autoloads generation for aggressive-indent
---
GNUmakefile | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index 6a2aa1e..e35b82d 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -105,6 +105,18 @@ endef
# Compute the set of autolods files and their dependencies.
autoloads := $(foreach pkg, $(pkgs), $(pkg)/$(notdir $(pkg))-autoloads.el)
+# FIXME: In 99% of the cases, autoloads can be generated in any order.
+# But the `names' package is an exception because it sets up an advice that
+# changes the way autload.el operates, and that advice is needed when creating
+# the autoloads file of packages that use `names', such as `aggressive-indent'.
+# The right solution is to check the Package-Requires and create the autoloads
+# files in topological order, but for now we'll just do it the ad-hoc way
+# add hand-made dependencies between autoloads files, and explicitly
+# load the names-autoloads file when building autoloads files.
+
+packages/aggressive-indent/aggressive-indent-autoloads.el: \
+ packages/names/names-autoloads.el
+
$(foreach al, $(autoloads), $(eval $(call RULE-srcdeps, $(al))))
%-autoloads.el:
@echo 'Generating autoloads for $@'
@@ -112,6 +124,7 @@ $(foreach al, $(autoloads), $(eval $(call RULE-srcdeps,
$(al))))
$(EMACS) -l $(CURDIR)/admin/archive-contents.el \
--eval "(archive--refresh-pkg-file)" \
--eval "(require 'package)" \
+ --eval "(load (expand-file-name \"../names/names-autoloads.el\")
t t)" \
--eval "(package-generate-autoloads \"$$(basename $$(pwd))\" \
\"$$(pwd)\")"