From nobody Sun Oct 5 16:15:52 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1584013849; cv=none; d=zohomail.com; s=zohoarc; b=e3cEfaDWFq/soajvM68Y2BQcLoXJcvoFko/NFmcH8ZMaJcwaRkzj1WGMmyAQCVFm7ixmUftNRfJBmOqXcAeBCAzhwZKbBbh431RxLe60XQYawXxtTUAK/23cvSYl5LNHeP6iUcP4+NCp+vR27eHKkD+y2MS9LxYIbKtOQ7hU/jo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584013849; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=m0cla1H6G0wBqhsK9L8mT4+s11Rs4vOjgckaETpe09k=; b=ATpdwTDbenGQ0z/2z1+d9adDqFUf49lzb41sM3eaCTfIYnIdLsZN0jnLh0Y5OClBrD3xCUB16YRAqc3k+Q4/AAI6UGas3GP9raYiTavZUxMXN7/NyKK1ETLIAFWDZBaa07a9lwPY4GjrK4reMj/jDT6Y+YRnHw4y3wdBgzFdY8Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584013849967318.47185487280035; Thu, 12 Mar 2020 04:50:49 -0700 (PDT) Received: from localhost ([::1]:39980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCMMS-0000um-NE for importer@patchew.org; Thu, 12 Mar 2020 07:50:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58156) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCMGE-0003eu-Si for qemu-devel@nongnu.org; Thu, 12 Mar 2020 07:44:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCMGC-000252-MN for qemu-devel@nongnu.org; Thu, 12 Mar 2020 07:44:21 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:38150) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jCMGC-00024R-F3 for qemu-devel@nongnu.org; Thu, 12 Mar 2020 07:44:20 -0400 Received: by mail-wm1-x335.google.com with SMTP id h83so2363329wmf.3 for ; Thu, 12 Mar 2020 04:44:20 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id p16sm2688564wmg.22.2020.03.12.04.44.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2020 04:44:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=m0cla1H6G0wBqhsK9L8mT4+s11Rs4vOjgckaETpe09k=; b=c/7Qr1rDqHNjw2CjtQiduELxARnS8C8tp6Yag+UXQw7EvJrtKQ3jIQWWmGqU1E5+aj TREp7mnE84Y0Eg5VVVBKfKouCprZ9W3kj1/sQCeziYhgM5BwsMKWFwV5XeVML0LGpakW DD3pi1oBPF2kTGL93KxYozO6QOO1lK31R71AKHoTr3ivYeaVF22bTQ4pkIhMn7YPfpup GRLliNjhmr69QfOcmXTvjg+Lsi0+bNrh8YuI7Mz3huNE0prpULD/OQc3Vo5KBWekQnOE gLHsYyEW8cIMBH5ClF2PT8wqzJDiHsDkgrBe2hVWewZG3W0w7QZ6L5WjaJCZYYAav258 zvCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m0cla1H6G0wBqhsK9L8mT4+s11Rs4vOjgckaETpe09k=; b=c/qLFJkpesyqP65Rs4q3ceuGQy8m+GcGVtdCGqWvydj0wH077MRZ0We37RkZ+eCXcC e/UPhLLSLJEe2j619mJ8HE4ImNy1Ksc+6IqoUMwudwwREigvb6j10Y0AjUcXuc4Y66S9 xuWDywsdj7GWuNIsAglPQnVIgC+YIbRsYrWutPNHHdxtqHm2NDBmX4KZoArvwWWZ/snT f53ctYdwLIpWCiJ+jGe3PSSieK8Ohh7txsllhVBF32TWPyTyn49MzlJmNcd8hhiz8cbf 7LGC8DQNMaNEGGi+6CI7gOs2PvuwB30JUPc7gy28hzkac0RDfd1dU5Ou6ORbduXCpNPA Kotg== X-Gm-Message-State: ANhLgQ0gEWLudOoG4iDrJcRmp/ZPvSJh2we+RXYybvDKa9CJgPPou/Ha euUeSdQil0anZS6v1Rtpi8BCfAnwPPk8CQ== X-Google-Smtp-Source: ADFU+vtqGVtIjO+IbCrPyNF+Ie8z1jkeC8txFLJ9mcCmZU/Nf1rL++CaLFC82uJBWTLYNzcbXx6iMQ== X-Received: by 2002:a7b:ce94:: with SMTP id q20mr4272715wmj.157.1584013459185; Thu, 12 Mar 2020 04:44:19 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 08/12] Makefile: Allow for subdirectories in Sphinx manual dependencies Date: Thu, 12 Mar 2020 11:44:04 +0000 Message-Id: <20200312114408.16891-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200312114408.16891-1-peter.maydell@linaro.org> References: <20200312114408.16891-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Currently we put 'docs/foo/*.rst' in the Make list of dependencies for the Sphinx 'foo' manual, which means all the files must be in the top level of that manual's directory. We'd like to be able to have subdirectories inside some of the manuals, so add 'docs/foo/*/*.rst' to the dependencies too. Signed-off-by: Peter Maydell Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Niek Linnenbank Reviewed-by: Richard Henderson Message-id: 20200309215818.2021-2-peter.maydell@linaro.org --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 65e89b5095a..7df22fcc5da 100644 --- a/Makefile +++ b/Makefile @@ -1078,7 +1078,7 @@ sphinxdocs: $(MANUAL_BUILDDIR)/devel/index.html \ # a single doctree: https://github.com/sphinx-doc/sphinx/issues/2946 build-manual =3D $(call quiet-command,CONFDIR=3D"$(qemu_confdir)" $(SPHINX= _BUILD) $(if $(V),,-q) -W -b $2 -D version=3D$(VERSION) -D release=3D"$(FUL= L_VERSION)" -d .doctrees/$1-$2 $(SRC_PATH)/docs/$1 $(MANUAL_BUILDDIR)/$1 ,"= SPHINX","$(MANUAL_BUILDDIR)/$1") # We assume all RST files in the manual's directory are used in it -manual-deps =3D $(wildcard $(SRC_PATH)/docs/$1/*.rst) \ +manual-deps =3D $(wildcard $(SRC_PATH)/docs/$1/*.rst $(SRC_PATH)/docs/$1/*= /*.rst) \ $(SRC_PATH)/docs/defs.rst.inc \ $(SRC_PATH)/docs/$1/conf.py $(SRC_PATH)/docs/conf.py \ $(SRC_PATH)/docs/sphinx/*.py --=20 2.20.1