branch: externals/transient
commit e57d1e176b4737421d81cc5c2d9e5354321cad2e
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>
make: Cosmetics
For consistency with Makefiles of related repositories.
---
.gitignore | 6 +++---
Makefile | 12 ++----------
docs/Makefile | 1 +
lisp/Makefile | 7 +++----
4 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3578139fdf..d39c061d3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
/config.mk
/docs/*.html
-/docs/*.info
/docs/*.pdf
/docs/dir
/docs/stats/
-/docs/transient/
+/lisp/*-autoloads.el
/lisp/*.elc
-/lisp/transient-autoloads.el
+
+/docs/transient/
diff --git a/Makefile b/Makefile
index db38d2cdd6..404f119c90 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
-include config.mk
include default.mk
-.PHONY: lisp docs clean
+.PHONY: lisp docs
all: lisp docs
help:
$(info make all - generate lisp and manual)
- $(info make docs - generate most manual formats)
$(info make lisp - generate byte-code and autoloads)
+ $(info make docs - generate most manual formats)
$(info make texi - generate texi manual (see comments))
$(info make info - generate info manual)
$(info make html - generate html manual file)
@@ -25,28 +25,21 @@ lisp:
docs:
@$(MAKE) -C docs docs
-
texi: bump-version
@$(MAKE) -C docs texi
-
info:
@$(MAKE) -C docs info
-
html:
@$(MAKE) -C docs html
-
html-dir:
@$(MAKE) -C docs html-dir
-
pdf:
@$(MAKE) -C docs pdf
-
stats:
@$(MAKE) -C docs stats
publish:
@$(MAKE) -C docs publish
-
release:
@$(MAKE) VERSION=$(VERSION) -C docs release
@@ -57,6 +50,5 @@ bump-version:
@sed -i -e "/Package-Version:/s|UNRELEASED|$(shell date +%F)|"
docs/CHANGELOG
clean:
- @printf "Cleaning...\n"
@$(MAKE) -C lisp clean
@$(MAKE) -C docs clean
diff --git a/docs/Makefile b/docs/Makefile
index ae2a4f5287..f94aeea658 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -101,4 +101,5 @@ release: html html-dir pdf
CLEAN = $(PKG).info dir $(PKG) $(PKG).html $(PKG).pdf
clean:
+ @printf "Cleaning docs/*...\n"
@rm -rf $(CLEAN)
diff --git a/lisp/Makefile b/lisp/Makefile
index 280b317485..ba0c4c1992 100644
--- a/lisp/Makefile
+++ b/lisp/Makefile
@@ -7,13 +7,12 @@ loaddefs: $(PKG)-autoloads.el
%.elc: %.el
@printf "Compiling $<\n"
- @$(EMACS) -Q --batch $(EMACS_ARGS) \
- $(LOAD_PATH) --funcall batch-byte-compile $<
+ @$(EMACS) -Q --batch $(EMACS_ARGS) $(LOAD_PATH) -f batch-byte-compile $<
-CLEAN = $(ELCS) $(PKG)-autoloads.el
+CLEAN = $(ELCS) $(PKG)-autoloads.el
clean:
- @printf "Cleaning...\n"
+ @printf "Cleaning lisp/*...\n"
@rm -rf $(CLEAN)
define LOADDEFS_TMPL
