From 05d11e19c574c11851c75a53ba0d5f655778679d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 3 Oct 2014 19:01:49 +0200 Subject: [PATCH] docs/manual: use the new hooks instead of gendoc rules Also reorder a bit the definition of the variables, to more resemble a package. Yet a bit more... Signed-off-by: "Yann E. MORIN" Cc: Samuel Martin Cc: Thomas De Schampheleire Reviewed-by: Samuel Martin Reviewed-by: Thomas De Schampheleire Signed-off-by: Peter Korsgaard --- docs/manual/manual.mk | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk index ee7887c355..e9e0516deb 100644 --- a/docs/manual/manual.mk +++ b/docs/manual/manual.mk @@ -151,25 +151,28 @@ endef # The Buildroot manual ################################################################################ -# Our manual needs to generate lists -manual-prepare-sources: manual-update-lists +MANUAL_SOURCES = $(sort $(wildcard docs/manual/*.txt) $(wildcard docs/images/*)) +MANUAL_RESOURCES = $(TOPDIR)/docs/images +# Our manual needs to generate lists # Packages included in BR2_EXTERNAL are not part of buildroot, so they # should not be included in the manual. -.PHONY: manual-update-lists -manual-update-lists: manual-check-dependencies-lists $(BUILD_DIR)/docs/$(pkgname) +define MANUAL_GEN_LISTS $(Q)$(call MESSAGE,"Updating the manual lists...") $(Q)BR2_DEFCONFIG="" TOPDIR=$(TOPDIR) O=$(BUILD_DIR)/docs/$(pkgname) \ BR2_EXTERNAL=$(TOPDIR)/support/dummy-external \ python -B $(TOPDIR)/support/scripts/gen-manual-lists.py +endef +MANUAL_POST_RSYNC_HOOKS += MANUAL_GEN_LISTS -manual-check-dependencies-lists: +# Our list-generating script requires argparse +define MANUAL_CHECK_LISTS_DEPS $(Q)if ! python -c "import argparse" >/dev/null 2>&1 ; then \ echo "You need python with argparse on your host to generate" \ "the list of packages in the manual"; \ exit 1; \ fi +endef +MANUAL_CHECK_DEPENDENCIES_HOOKS += MANUAL_CHECK_LISTS_DEPS -MANUAL_SOURCES = $(sort $(wildcard docs/manual/*.txt) $(wildcard docs/images/*)) -MANUAL_RESOURCES = $(TOPDIR)/docs/images $(eval $(call GENDOC)) -- 2.30.2