[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/org-edna 3167ea7 39/72: Added check and local settings to
From: |
Ian Dunn |
Subject: |
[elpa] scratch/org-edna 3167ea7 39/72: Added check and local settings to Makefile |
Date: |
Sun, 21 May 2017 21:11:24 -0400 (EDT) |
branch: scratch/org-edna
commit 3167ea7f34d1b6aa7f98193ebf414e2356c45350
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] scratch/org-edna 0444691 49/72: Fixed error in last commit, (continued)
- [elpa] scratch/org-edna 0444691 49/72: Fixed error in last commit, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 9573539 53/72: Added Savannah project link to documentation, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 406f8ea 67/72: Fixed ancestors example, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 69ecfe4 57/72: Added tests for conditions, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 74dae46 51/72: Added tests for finders, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna f56be02 69/72: Silenced byte-compiler, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 8c31160 59/72: Added tests for actions, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 83663fa 64/72: Cleaned up package header and added various docstrings, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 37e9b58 50/72: Fixed chain-find and planning actions, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna ad0f3ef 66/72: Added in-buffer settings and new sections to Documentation, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 3167ea7 39/72: Added check and local settings to Makefile,
Ian Dunn <=
- [elpa] scratch/org-edna 50652ab 58/72: Added installation and setup instructions to documentation, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 191c938 41/72: Added copyright and licensing information to all files, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 7e1dafb 44/72: Fixed license blocks in elisp files, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 831ef13 54/72: Fixed variable-set condition, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 628869b 56/72: Fixed error reporting, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna a82892c 47/72: Fixed bugs from last commit, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna e3d2e89 61/72: Documented delete-property! action, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 0035a7b 46/72: Various parsing fixes, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna b4d1b1f 70/72: Added more docstrings, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 226195b 68/72: Added docstrings to some finders, Ian Dunn, 2017/05/21