[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master eda515d 039/135: Added check and local settings to Makefil
From: |
Ian Dunn |
Subject: |
[elpa] master eda515d 039/135: Added check and local settings to Makefile |
Date: |
Mon, 17 Feb 2020 10:52:49 -0500 (EST) |
branch: master
commit eda515d20906e2599f6fa90dab0f261b53c501f8
Author: Ian D <address@hidden>
Commit: Ian D <address@hidden>
Added check and local settings to Makefile
---
.bzrignore | 3 ++-
Makefile | 29 ++++++++++++++++++++++++++++-
Makefile => defaults.mk | 25 +++++--------------------
3 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/.bzrignore b/.bzrignore
index 016d3b1..507633b 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1 +1,2 @@
-*.elc
\ No newline at end of file
+*.elc
+local.mk
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 74e079a..0b504f9 100644
--- a/Makefile
+++ b/Makefile
@@ -15,11 +15,19 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-EMACS=emacs --batch
+# Load defaults
+include defaults.mk
+
+# Load local definitions
+include local.mk
+
+EMACS=$(emacs) --batch -L $(org_path)
ALLSRC=org-edna.el
SOURCE=$(ALLSRC)
TARGET=$(patsubst %.el,%.elc,$(SOURCE))
+.PHONY: clean check local.mk help
+
all: $(TARGET)
compile: $(TARGET)
@@ -39,3 +47,22 @@ org-edna-autoloads.el:
clean:
-rm -f *.elc
+
+check:
+ @$(EMACS) \
+ -L "." \
+ --load "ert" \
+ --load "org-edna-tests.el" \
+ -f ert-run-tests-batch-and-exit
+
+local.mk:
+ @cp -n defaults.mk local.mk
+
+help:
+ $(info )
+ $(info make all - Default)
+ $(info make compile - Compile Emacs Lisp Files)
+ $(info make autoloads - Generate Autoloads)
+ $(info make clean - Remove generated .elc files)
+ $(info make check - Run Tests)
+ @echo ""
diff --git a/Makefile b/defaults.mk
similarity index 63%
copy from Makefile
copy to defaults.mk
index 74e079a..aed4ab3 100644
--- a/Makefile
+++ b/defaults.mk
@@ -15,27 +15,12 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-EMACS=emacs --batch
-ALLSRC=org-edna.el
-SOURCE=$(ALLSRC)
-TARGET=$(patsubst %.el,%.elc,$(SOURCE))
+emacs = emacs
-all: $(TARGET)
+prefix = /usr/share
-compile: $(TARGET)
+org_path = $(prefix)/emacs/site-lisp/org
-%.elc: %.el
- @$(EMACS) \
- -L "." \
- -f batch-byte-compile $<
+info_dir = $(prefix)/info
-autoloads: org-edna-autoloads.el
-
-org-edna-autoloads.el:
- @$(EMACS) \
- --eval "(require 'package)" \
- --eval "(setq inhibit-message t)" \
- --eval "(package-generate-autoloads \"org-edna\" \"$$(pwd)\")"
-
-clean:
- -rm -f *.elc
+lisp_dir = $(prefix)/emacs/site-lisp/
- [elpa] master a758e6a 051/135: Added tests for finders, (continued)
- [elpa] master a758e6a 051/135: Added tests for finders, Ian Dunn, 2020/02/17
- [elpa] master 3f4595b 052/135: Finished rough draft of documentation, Ian Dunn, 2020/02/17
- [elpa] master 329b39e 058/135: Added installation and setup instructions to documentation, Ian Dunn, 2020/02/17
- [elpa] master e793f3c 047/135: Fixed bugs from last commit, Ian Dunn, 2020/02/17
- [elpa] master c29a951 045/135: Use example instead of src to make HTML export prettier, Ian Dunn, 2020/02/17
- [elpa] master 5b1c81a 049/135: Fixed error in last commit, Ian Dunn, 2020/02/17
- [elpa] master 99939aa 048/135: Handle all errors in Edna forms, Ian Dunn, 2020/02/17
- [elpa] master d07a8d8 035/135: Added note about quoting file names to documentation., Ian Dunn, 2020/02/17
- [elpa] master bb3c739 044/135: Fixed license blocks in elisp files, Ian Dunn, 2020/02/17
- [elpa] master 3a3ed39 046/135: Various parsing fixes, Ian Dunn, 2020/02/17
- [elpa] master eda515d 039/135: Added check and local settings to Makefile,
Ian Dunn <=
- [elpa] master f560f1b 056/135: Fixed error reporting, Ian Dunn, 2020/02/17
- [elpa] master 827d7c1 060/135: Fixed up chain test, Ian Dunn, 2020/02/17
- [elpa] master 89c2ecf 057/135: Added tests for conditions, Ian Dunn, 2020/02/17
- [elpa] master 03bafb0 061/135: Documented delete-property! action, Ian Dunn, 2020/02/17
- [elpa] master 4c26cc8 041/135: Added copyright and licensing information to all files, Ian Dunn, 2020/02/17
- [elpa] master 390ee68 067/135: Fixed ancestors example, Ian Dunn, 2020/02/17
- [elpa] master 3b3625f 064/135: Cleaned up package header and added various docstrings, Ian Dunn, 2020/02/17
- [elpa] master a71c519 068/135: Added docstrings to some finders, Ian Dunn, 2020/02/17
- [elpa] master 3ff308b 055/135: Updated to new syntax, Ian Dunn, 2020/02/17
- [elpa] master 7618794 066/135: Added in-buffer settings and new sections to Documentation, Ian Dunn, 2020/02/17