summaryrefslogtreecommitdiff
path: root/mk/targets.mk
diff options
context:
space:
mode:
authorSébastien Delafond <sdelafond@gmail.com>2015-08-25 12:27:35 +0200
committerSébastien Delafond <sdelafond@gmail.com>2015-08-25 12:27:35 +0200
commit1be13d57dc8357576a8285c6dadc03db9e3ed7b0 (patch)
treee35b32d4dbd60cb6cea09f3c0797cc8877352def /mk/targets.mk
parent4dc4918d0d667f18f3d5e3dd71e6f117ddb8af8a (diff)
Imported Upstream version 8.3.1
Diffstat (limited to 'mk/targets.mk')
-rw-r--r--mk/targets.mk11
1 files changed, 8 insertions, 3 deletions
diff --git a/mk/targets.mk b/mk/targets.mk
index 7f26d86..d390fdb 100644
--- a/mk/targets.mk
+++ b/mk/targets.mk
@@ -31,13 +31,14 @@ endif
clean-install cleanelc cleandirs cleanaddcontrib \
cleanlisp cleandoc cleandocs cleantest \
compile compile-dirty uncompiled \
- config config-test config-exe config-all config-eol config-version
+ config config-test config-exe config-all config-eol config-version \
+ vanilla
CONF_BASE = EMACS DESTDIR ORGCM ORG_MAKE_DOC
CONF_DEST = lispdir infodir datadir testdir
-CONF_TEST = BTEST_PRE BTEST_POST BTEST_OB_LANGUAGES BTEST_EXTRA
+CONF_TEST = BTEST_PRE BTEST_POST BTEST_OB_LANGUAGES BTEST_EXTRA BTEST_RE
CONF_EXEC = CP MKDIR RM RMR FIND SUDO PDFTEX TEXI2PDF TEXI2HTML MAKEINFO INSTALL_INFO
-CONF_CALL = BATCH BATCHL ELC ELCDIR BTEST MAKE_LOCAL_MK MAKE_ORG_INSTALL MAKE_ORG_VERSION
+CONF_CALL = BATCH BATCHL ELC ELCDIR NOBATCH BTEST MAKE_LOCAL_MK MAKE_ORG_INSTALL MAKE_ORG_VERSION
config-eol:: EOL = \#
config-eol:: config-all
config config-all::
@@ -94,6 +95,9 @@ compile compile-dirty::
all clean-install::
$(foreach dir, $(SUBDIRS), $(MAKE) -C $(dir) $@;)
+vanilla:
+ -@$(NOBATCH) &
+
check test:: compile
check test test-dirty::
-$(MKDIR) $(testdir)
@@ -104,6 +108,7 @@ endif
up0:: cleanaddcontrib
up0 up1 up2::
+ git checkout $(GIT_BRANCH)
git remote update
git pull
up1 up2:: all