From d9ed001b46cc6e510ea2267fa205abd036be10b6 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Mon, 18 May 2015 10:11:02 +0200 Subject: [PATCH] fix(make): clean was depending on unknown targets There are no per-program-type docs clean, just made it depend on docs-all-clean. Also added the `docs-api|cli` target to the generated per-program-type make help. It was just missing, even though it existed. --- Makefile | 4 ++-- src/mako/deps.mako | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 8b3a451d1d..d97c834999 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: clean help deps regen-apis license ubuntu-build +.PHONY: help deps regen-apis license ubuntu-build wheezy-build clean .SUFFIXES: VENV = .virtualenv/virtualenv.py @@ -86,6 +86,6 @@ wheezy-build: regen-apis: | clean-all-api clean-all-cli gen-all-api gen-all-cli license -clean: clean-all-api clean-all-cli +clean: clean-all-api clean-all-cli docs-all-clean -rm -Rf $(VENV_DIR) -rm $(API_DEPS) $(CLI_DEPS) diff --git a/src/mako/deps.mako b/src/mako/deps.mako index 17ede4b2c1..9596689d5b 100644 --- a/src/mako/deps.mako +++ b/src/mako/deps.mako @@ -132,12 +132,7 @@ ${api_clean}: % endfor % endfor -% if agsuffix not in ["-api", "-cli"]: -clean-all${agsuffix}: ${space_join(1)} docs-clean${agsuffix} -% else: clean-all${agsuffix}: ${space_join(1)} -% endif - cargo${agsuffix}: ${space_join(2)} publish${agsuffix}: | gen-all${agsuffix} ${space_join(4)} gen-all${agsuffix}: ${space_join(0)} @@ -164,6 +159,7 @@ docs${agsuffix}: ${' '.join(central_api_index(util.library_to_crate_name(a[0])) help${agsuffix}: $(info gen-all${agsuffix} - make all ${make.target_name}) + $(info docs${agsuffix} - make all ${make.target_name} documentation) $(info clean-all${agsuffix} - delete all generated ${make.target_name}) $(info cargo${agsuffix} - run cargo on all ${make.target_name}, use ARGS="args ..." to specify cargo arguments) $(info publish${agsuffix} - run cargo publish on all ${make.target_name} and remember successful ones with marker files)