From patchwork Sun Sep 14 11:07:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 389052 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 0DF3D140171 for ; Sun, 14 Sep 2014 21:09:04 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 574BA921F3; Sun, 14 Sep 2014 11:09:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oCkykRskZrKG; Sun, 14 Sep 2014 11:09:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 34B0A92210; Sun, 14 Sep 2014 11:08:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 1C12C1C0F18 for ; Sun, 14 Sep 2014 11:08:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 17C0C3369D for ; Sun, 14 Sep 2014 11:08:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 41aRPKxyr55d for ; Sun, 14 Sep 2014 11:08:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by silver.osuosl.org (Postfix) with ESMTPS id C2CE331716 for ; Sun, 14 Sep 2014 11:08:17 +0000 (UTC) Received: by mail-we0-f177.google.com with SMTP id u57so2654125wes.8 for ; Sun, 14 Sep 2014 04:08:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=C7ixcxc+oUEmVEnObst+cSkKJpVYXzh6pWybGBL4twk=; b=x3xxUWraD8Hwc0tWDXlBqGhBCaXHR5Ujl6spXf17AVqI6i4qHeJJV12da5RHjF7TXg p5bNVJqBXVKWN9ty7l+3WdMdqXQdf+rsnRzo5W+SQ7oxl4zal/b4D2GXtwBbOQ7l9i4J mkIKNLq8rOIaUcqXCf5UBfb667nis1iOCkWhwXD1piLhvzYuji3h5HIHmSTr0eT7Agso ssyhDZlJp6NJ8aP6+rMYoOiQWKCDQSOVkuUhLoaghFtjlO6708TIJYVMulPrUR2m/fNQ aWKY3SwmMUVYyxgV/toRdKLyRnB3cb0Wri5Vrtom56Q1IT4PoGhkR9CAMU+0hjD7HqsD uwhg== X-Received: by 10.180.84.193 with SMTP id b1mr16348348wiz.40.1410692896348; Sun, 14 Sep 2014 04:08:16 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id w10sm10800882wje.10.2014.09.14.04.08.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 14 Sep 2014 04:08:15 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 14 Sep 2014 13:07:47 +0200 Message-Id: <70556c0eff45d8d8b3a61763410abbe6c6e771c4.1410692670.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 13/23 v5] docs/manual: properly separate rules specific for our manual X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Move the rules specific to our own manual, so that they do not interfere with the generic rules of GENDOC. Separate them with a shinny header. ;-) Signed-off-by: "Yann E. MORIN" Cc: Samuel Martin Cc: Thomas De Schampheleire Acked-by: Thomas De Schampheleire --- docs/manual/manual.mk | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk index 9a50e1d..6744e4a 100644 --- a/docs/manual/manual.mk +++ b/docs/manual/manual.mk @@ -1,14 +1,3 @@ -# 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)/$(pkgname) - $(Q)$(call MESSAGE,"Updating the manual lists...") - $(Q)BR2_DEFCONFIG="" TOPDIR=$(TOPDIR) O=$(BUILD_DIR)/$(pkgname) \ - BR2_EXTERNAL=$(TOPDIR)/support/dummy-external \ - python -B $(TOPDIR)/support/scripts/gen-manual-lists.py - -manual-prepare-sources: manual-update-lists - # we can't use suitable-host-package here because that's not available in # the context of 'make release' manual-check-dependencies: @@ -28,13 +17,6 @@ manual-check-dependencies-pdf: exit 1; \ fi -manual-check-dependencies-lists: - $(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 - # PDF manual generation is broken because of a bug in xsltproc program provided # by libxslt <=1.1.28, which does not honor an option we need to set. # Fortunately, this bug is already fixed upstream: @@ -156,6 +138,29 @@ $(pkgname)-clean: .PHONY: $(pkgname) $(pkgname)-clean endef +################################################################################ +# The Buildroot manual +################################################################################ + +# Our manual needs to generate lists +manual-prepare-sources: manual-update-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)/$(pkgname) + $(Q)$(call MESSAGE,"Updating the manual lists...") + $(Q)BR2_DEFCONFIG="" TOPDIR=$(TOPDIR) O=$(BUILD_DIR)/$(pkgname) \ + BR2_EXTERNAL=$(TOPDIR)/support/dummy-external \ + python -B $(TOPDIR)/support/scripts/gen-manual-lists.py + +manual-check-dependencies-lists: + $(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 + MANUAL_SOURCES = $(sort $(wildcard docs/manual/*.txt) $(wildcard docs/images/*)) MANUAL_RESSOURCES = $(TOPDIR)/docs/images $(eval $(call GENDOC))