aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-06-05 03:36:51 -0400
committerJustin M. Keyes <justinkz@gmail.com>2016-06-06 11:05:09 -0400
commit704b58e54abd1adaaa83f00dae7fdb0f385b428b (patch)
treefeabcbb1df1390db22c08e9ae816c0533a16862e
parent234346312eb1c429bffba9f893986266e14dceca (diff)
downloadrneovim-704b58e54abd1adaaa83f00dae7fdb0f385b428b.tar.gz
rneovim-704b58e54abd1adaaa83f00dae7fdb0f385b428b.tar.bz2
rneovim-704b58e54abd1adaaa83f00dae7fdb0f385b428b.zip
build: define `helptags` target which always runs.
Specify that the ${GENERATED_HELP_TAGS} "command" (output) depends on `helptags` so that it always regenerates the doc/ tags. (cmake "targets" always run, whereas "commands" are contingent on their dependencies. But we don't define doc/ dependencies because they are circular.)
-rw-r--r--Makefile4
-rw-r--r--runtime/CMakeLists.txt7
2 files changed, 8 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 5b04b74139..552a79466b 100644
--- a/Makefile
+++ b/Makefile
@@ -85,10 +85,10 @@ endif
mkdir -p build
touch $@
-oldtest: | nvim tags
+oldtest: | nvim helptags
+$(SINGLE_MAKE) -C src/nvim/testdir $(MAKEOVERRIDES)
-tags: | nvim
+helptags: | nvim
+$(BUILD_CMD) -C build runtime/doc/tags
functionaltest: | nvim
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index 92d1391cfd..4dbd193dab 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -31,7 +31,7 @@ add_custom_command(OUTPUT copy_docfiles
${PROJECT_SOURCE_DIR}/runtime/doc ${GENERATED_RUNTIME_DIR}/doc
)
-add_custom_command(OUTPUT ${GENERATED_HELP_TAGS}
+add_custom_target(helptags
COMMAND "${PROJECT_BINARY_DIR}/bin/nvim"
-u NONE
-i NONE
@@ -45,6 +45,11 @@ add_custom_command(OUTPUT ${GENERATED_HELP_TAGS}
WORKING_DIRECTORY "${GENERATED_RUNTIME_DIR}/doc"
)
+add_custom_command(OUTPUT ${GENERATED_HELP_TAGS}
+ DEPENDS
+ helptags
+)
+
add_custom_target(doc_html
COMMAND make html
DEPENDS