aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVegard Øye <vegard_oye@hotmail.com>2011-08-08 21:15:39 +0200
committerVegard Øye <vegard_oye@hotmail.com>2011-08-08 21:15:39 +0200
commit9a9fbc8a39ac46ad55cc06743fa69b90e26a866a (patch)
treeb76dd898f9b69a9599118421b1766fcce9af0bd7
parent987f396a2426fdc419fec5c635390e9fa1c016e3 (diff)
Move dependencies into subdirectory
That way they don't enter the user's `load-path' when following the installation instructions.
-rw-r--r--Makefile14
-rw-r--r--lib/README6
-rw-r--r--lib/ert.el (renamed from ert.el)0
-rw-r--r--lib/goto-chg.el (renamed from goto-chg.el)0
-rw-r--r--lib/undo-tree.el (renamed from undo-tree.el)0
5 files changed, 13 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index adf817c..f3b943a 100644
--- a/Makefile
+++ b/Makefile
@@ -9,13 +9,13 @@ TAG =
all: compile
compile: clean
for f in ${FILES}; do \
- $(EMACS) --batch -Q -L . -f batch-byte-compile $$f; \
+ $(EMACS) --batch -Q -L . -L lib -f batch-byte-compile $$f; \
done
# Byte-compile all files in one batch. This is faster than
# compiling each file in isolation, but also less stringent.
compile-batch: clean
- $(EMACS) --batch -Q -L . -f batch-byte-compile ${FILES}
+ $(EMACS) --batch -Q -L . -L lib -f batch-byte-compile ${FILES}
# Delete byte-compiled files.
clean:
@@ -28,18 +28,18 @@ clean:
# make test TAG=repeat
# This will only run tests pertaining to the repeat system.
test: clean
- $(EMACS) --batch -Q -L . -l evil-tests.el \
+ $(EMACS) --batch -Q -L . -L lib -l evil-tests.el \
--eval "(evil-tests-run '(${TAG}))"
# Byte-compile Evil and run all tests.
tests: compile-batch
- $(EMACS) --batch -Q -L . -l evil-tests.el \
+ $(EMACS) --batch -Q -L . -L lib -l evil-tests.el \
--eval "(evil-tests-run '(${TAG}))"
rm -f *.elc
# Load Evil in a fresh instance of Emacs and run all tests.
emacs: clean
- $(EMACS) -Q -L . -l evil-tests.el --eval "(evil-mode 1)" \
+ $(EMACS) -Q -L . -L lib -l evil-tests.el --eval "(evil-mode 1)" \
--eval "(if (y-or-n-p-with-timeout \"Run tests? \" 2 t) \
(evil-tests-run '(${TAG}) t) \
(message \"You can run the tests at any time with \`M-x evil-tests-run\'\"))" &
@@ -47,7 +47,7 @@ emacs: clean
# Load Evil in a terminal Emacs and run all tests.
term: terminal
terminal: clean
- $(EMACS) -nw -Q -L . -l evil-tests.el --eval "(evil-mode 1)" \
+ $(EMACS) -nw -Q -L . -L lib -l evil-tests.el --eval "(evil-mode 1)" \
--eval "(if (y-or-n-p-with-timeout \"Run tests? \" 2 t) \
(evil-tests-run '(${TAG}) t) \
(message \"You can run the tests at any time with \`M-x evil-tests-run\'\"))"
@@ -56,7 +56,7 @@ terminal: clean
# Loads Evil into memory in order to indent macros properly.
# Also removes trailing whitespace, tabs and extraneous blank lines.
indent: clean
- $(EMACS) --batch ${FILES} -Q -L . -l evil-tests.el \
+ $(EMACS) --batch ${FILES} -Q -L . -L lib -l evil-tests.el \
--eval "(dolist (buffer (reverse (buffer-list))) \
(when (buffer-file-name buffer) \
(set-buffer buffer) \
diff --git a/lib/README b/lib/README
new file mode 100644
index 0000000..16766cb
--- /dev/null
+++ b/lib/README
@@ -0,0 +1,6 @@
+This folder contains external libraries that are freely distributable
+under the GNU GPL license. They may not be up to date.
+
+Emacs does not add subdirectories to the `load-path' by default.
+Therefore this directory is not covered by the installation
+instructions.
diff --git a/ert.el b/lib/ert.el
index 5bd8fd0..5bd8fd0 100644
--- a/ert.el
+++ b/lib/ert.el
diff --git a/goto-chg.el b/lib/goto-chg.el
index 3881706..3881706 100644
--- a/goto-chg.el
+++ b/lib/goto-chg.el
diff --git a/undo-tree.el b/lib/undo-tree.el
index 4edfa9d..4edfa9d 100644
--- a/undo-tree.el
+++ b/lib/undo-tree.el