Commit 2ffcf5fe authored by Glenn Morris's avatar Glenn Morris
Browse files

Minor simplifications for test/automated/Makefile

* test/automated/Makefile.in (top_builddir, abs_test, abs_lispsrc, lisp):
Remove variables.
(emacs): Use abs_top_srcdir, abs_srcdir rather than abs_lispsrc, abs_test.
(lisp-compile): Use ../../lisp rather than $lisp.
parent 6a8b929e
2013-11-02 Glenn Morris <rgm@gnu.org>
* automated/Makefile.in (top_builddir, abs_test, abs_lispsrc, lisp):
Remove variables.
(emacs): Use abs_top_srcdir, abs_srcdir rather than abs_lispsrc,
abs_test.
(lisp-compile): Use ../../lisp rather than $lisp.
2013-10-31 Michael Albinus <michael.albinus@gmx.de>
* automated/ert-tests.el (ert-test-stats-set-test-and-result):
......
......@@ -21,13 +21,9 @@ SHELL = @SHELL@
srcdir = @srcdir@
abs_top_srcdir = @abs_top_srcdir@
top_builddir = @top_builddir@
abs_top_builddir = @abs_top_builddir@
test = $(srcdir)
abs_test = $(abs_srcdir)
VPATH = $(srcdir)
abs_lispsrc = $(abs_top_srcdir)/lisp
lisp = $(top_builddir)/lisp
# You can specify a different executable on the make command line,
# e.g. "make EMACS=../src/emacs ...".
......@@ -48,7 +44,7 @@ BYTE_COMPILE_EXTRA_FLAGS =
# The example above is just for developers, it should not be used by default.
# The actual Emacs command run in the targets below.
emacs = EMACSLOADPATH="$(abs_lispsrc):$(abs_test)" LC_ALL=C "$(EMACS)" $(EMACSOPT)
emacs = EMACSLOADPATH="$(abs_top_srcdir)/lisp:$(abs_srcdir)" LC_ALL=C "$(EMACS)" $(EMACSOPT)
# Common command to find subdirectories
setwins=subdirs=`find . -type d -print`; \
......@@ -81,7 +77,7 @@ doit:
.PHONY: lisp-compile compile-main compile compile-always
lisp-compile:
cd "$(lisp)"; $(MAKE) $(MFLAGS) compile EMACS="$(EMACS)"
cd ../../lisp && $(MAKE) $(MFLAGS) compile EMACS="$(EMACS)"
# In `compile-main' we could directly do
# ... | xargs $(MAKE) $(MFLAGS) EMACS="$(EMACS)"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment