From patchwork Wed Feb 5 09:48:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Eggers X-Patchwork-Id: 1233747 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::43a; helo=mail-wr1-x43a.google.com; envelope-from=swupdate+bncbaabbbm75lyqkgqe7n6c56a@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=arri.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=ECTGdHz1; dkim-atps=neutral Received: from mail-wr1-x43a.google.com (mail-wr1-x43a.google.com [IPv6:2a00:1450:4864:20::43a]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48CGwm137Lz9sSZ for ; Wed, 5 Feb 2020 20:48:56 +1100 (AEDT) Received: by mail-wr1-x43a.google.com with SMTP id w17sf914859wrr.9 for ; Wed, 05 Feb 2020 01:48:55 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1580896133; cv=pass; d=google.com; s=arc-20160816; b=w6GZ3ZwhG26r82TgeOZ2waoTKx9JnmHlZUxsnOokN3HESr6wM/IswpVXjTg8UnEEpd lZUFiiODx0teS7ZUvzERGRuEd6YQTO8TjEmBp9JQNkjCDRAEReOlfUVOy8FAjk/lQB86 4eY/RsNpoCw/XtA4em4zvaTfk0jSZjrM6dJxBKY/TzATyy+kjSL8UlFYA9x2v/bd9PEJ 0EoFS1WypsGv9lVHUMHNWqmJ7ckTCUbf5bujlp/rCSKFvM0+9A8BJUlekyDdBqUW2AYx mHvKUJLnjp8+q13lzRTUW8uG/DvqMVKSRzk1+LQlrAUnSPUTNXFhTz6fC4VPM/eS7SKe Vddg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=R3rq8ApauRc3i97gA2Kuht2okp45YFl2b83kJwe9EGE=; b=n48FAdcD2RPwKEt6fSHr/hxqy4NTANwPezlHBfyXnExPXKwSAvzJNxLVS05XZ6bn8X uyjq0mru1lvjgfEG5RDZkcZfuMivHGXmliBTA/KlsAjigxr4DRUN2X2St7HdS8b62eFH QhCHX9mzh7tswdRkN4XABBO+ASsLlRd7tRATw6FK3sZUET+GFvfikqSZPJqLDLIwctLz wj8P+i2pWJbqyxOT/vhNkPb+D4cfNdl325Dd9/gXkue1jX7qMyqQckKv2RsQObnkoXQz NMyzWcbpDedwbCepORND2hgFq9edXwrZmEZS44/ENCigh8btv/QbYD2b4bCJqcJjTLhH rdhQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ceggers@arri.de designates 94.199.90.91 as permitted sender) smtp.mailfrom=CEggers@arri.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=R3rq8ApauRc3i97gA2Kuht2okp45YFl2b83kJwe9EGE=; b=ECTGdHz1x7zpNK9iG6ZtV2ZV+0NsaEkGaeZ8wdqmyd7ne48TYax9B0F0jszm2pXRmn 66nOgP4vOOX3ctHkYZm+m1munPAtOCARanVT7WV/ex81xfqseXUlkuyPOJalFAxvkiBR EPN+Yio+fkeIvFUQ2htF1GdIkfyfmRwed8IEu++WnM/XJk9+pHHQWrPgViSV7beVFR1E 8Kuy0Yboy8ePlI3ShE9CMk3bNuriJMkOBphwO/8CfMAcvPQz930jIVeitoEqsiRGFPUP OlZVj0kDVzxoYquHd0S6oYQcV0nPTSC9Pq/R1llAwuItjZwhrJJmXa1Qw6YRoOIhNQfh /A5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=R3rq8ApauRc3i97gA2Kuht2okp45YFl2b83kJwe9EGE=; b=lkb70IXAffXeYYC95HiyNO99hGu8fI+gBKXBvsCWzrYCeun24gRokNKaxK91dRrRTu frsV09q7Rq4uMvhxkZwcY4ms1x3dXmnQ55hvsP1xqD/EbyR+e8SQxd1lwVfG3DZO3o9K I3iRd5n74R7PVMRUiw6HIKGAu5kpesDE7+xSzMI+dc/U2CPaZTH5yfosYGBi1cTDJ9/F sBeo8t5RHWCgzLMOZLRSumfC224EBBYAOJ9h8XDto2QwBvjfPMTMH2cVchaTsCKrr5Yk Rq5AqUfr23o87RtvT6/ECTDfP281flfEn6E1h6HVgvt4m3GFzk85u4qsWGlporVlRQny X1ug== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAV976mPiJXiWIjnJCBML1XZGyOIQzEtBTeJZ93a6bEnwZFbCId2 BFAh53mwt+G8hloojDbJYbQ= X-Google-Smtp-Source: APXvYqyO79NDQEiU6VJFlPTD6fXMe6LanaMD6s0JWB2ZUt9Wss62k8SZrU8jdd1iKsHywIpLVxNrWg== X-Received: by 2002:adf:f0cb:: with SMTP id x11mr27885949wro.421.1580896133253; Wed, 05 Feb 2020 01:48:53 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:eb4c:: with SMTP id u12ls571273wrn.6.gmail; Wed, 05 Feb 2020 01:48:52 -0800 (PST) X-Received: by 2002:adf:e781:: with SMTP id n1mr29429424wrm.56.1580896132746; Wed, 05 Feb 2020 01:48:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580896132; cv=none; d=google.com; s=arc-20160816; b=uAn0YWGQ5vpJBzSL9aAgbdnXBwAsuHawyEjSS79d61RN4yLr8E2r4v/v2t0owkDVv3 QAeAhJVthCYi+PATtBFmCSm6sXO8wBNjEaRVrC5aDiNECZl5dHtEVA5D8JprPRLjDGhn Wpb9DIFd0SdIxyXQbCyPTVgW/qXsuo8UHnQCSxjngNgTMGnHR5i9hvKhkuRW22D24OIP j4jG4PIRR3xtaLBvU/EOJZIgMn0ynUqNPYdohm8qXK+WFc4CCte9kQRz6REf7aiK//tv lxbXWl4jLQjKE2n6jH6Qd44Pe5UIsI+lwXFU9R5gyFp+SGqUfYJEcTt+51oMFOf0hSTE 28UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=Wp/Fxfj7ZUscMGl0chMXmgnkNCTllwitaa9byUUL8SI=; b=ycZ3qA2x9EYY4gaNK/fkJjAaVhkHHtg9mFfKOe+2VtToNCR6spTxzRbw1ZolcGw8YU Zg9t0eQgCnFHN+HJ509Bp5ncjLQiqijZEaGqcICOpg0UZpDcoFMcaS2bFm0Pwu8LqDsq Vrl/zfXVPJqZRQXFV4ApmpIF+DivVwFmi29z8FHHZd1YS133qtZJc2Jx0V6gJcNiD4Ig kcrWnKn/GJVfHCefu27WhVDyN/CIkrHwft8yXwJvw/5/0UPUR1md5/pU5qTJ+pgBHeE1 XspJL0Fj4h/nDy0mp19Mgrl1ppE1KKLjUtuBJfmSg5jT04c52A20bKfcQUnxGU89tYDU ndGA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ceggers@arri.de designates 94.199.90.91 as permitted sender) smtp.mailfrom=CEggers@arri.de Received: from mailout01.rmx.de (mailout01.rmx.de. [94.199.90.91]) by gmr-mx.google.com with ESMTPS id i15si984120wro.2.2020.02.05.01.48.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Feb 2020 01:48:52 -0800 (PST) Received-SPF: pass (google.com: domain of ceggers@arri.de designates 94.199.90.91 as permitted sender) client-ip=94.199.90.91; Received: from kdin02.retarus.com (unknown [172.19.17.49]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout01.rmx.de (Postfix) with ESMTPS id 48CGwf67fbz2SW6l for ; Wed, 5 Feb 2020 10:48:50 +0100 (CET) Received: from ppmail.arri.de (unknown [217.111.95.7]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by kdin02.retarus.com (Postfix) with ESMTPS id 48CGwZ0bjcz2TTQ5 for ; Wed, 5 Feb 2020 10:48:46 +0100 (CET) Received: from mta.arri.de ([192.168.100.141]) by ppmail.arri.de over TLS secured channel with Microsoft SMTPSVC(7.0.6002.18264); Wed, 5 Feb 2020 10:48:45 +0100 Received: from N95HX1G2.arri.de (192.168.201.254) by mta.arri.de (192.168.100.104) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 5 Feb 2020 10:48:45 +0100 From: Christian Eggers To: CC: , Christian Eggers Subject: [swupdate] [PATCH 1/5] Makefile: Fix out of tree build for documentation Date: Wed, 5 Feb 2020 10:48:05 +0100 Message-ID: <20200205094809.30185-2-ceggers@arri.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20200205094809.30185-1-ceggers@arri.de> References: <20200205094809.30185-1-ceggers@arri.de> MIME-Version: 1.0 X-Originating-IP: [192.168.201.254] X-OriginalArrivalTime: 05 Feb 2020 09:48:45.0806 (UTC) FILETIME=[754C78E0:01D5DC09] X-RMX-ID: 20200205-104846-48CGwZ0bjcz2TTQ5-0@172 X-RMX-SOURCE: 217.111.95.7 X-Original-Sender: ceggers@arri.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ceggers@arri.de designates 94.199.90.91 as permitted sender) smtp.mailfrom=CEggers@arri.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , The doc/Makefile expects to be run from the source directory (e.g. with a given BUILDDIR parameter). Tested with make targets "help", "clean" and "html" for in-tree and out-of-tree build. Fixes: 58a4c02953 ("Build documentation from main Makefile") Signed-off-by: Christian Eggers Acked-by: Stefano Babic --- Makefile | 15 ++++++++------- Makefile.help | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 4773d54..9f41235 100644 --- a/Makefile +++ b/Makefile @@ -531,7 +531,8 @@ clean: $(clean-dirs) -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ -o -name modules.builtin -o -name '.tmp_*.o.*' \ -o -name '*.gcno' \) -type f -print | xargs rm -f - @$(MAKE) -C doc clean + @pwd + $(Q)$(MAKE) -f $(srctree)/doc/Makefile BUILDDIR=$(CURDIR)/doc/build clean # mrproper - Delete all generated files, including .config # @@ -578,17 +579,17 @@ clean := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.clean obj endif #ifeq ($(config-targets),1) endif #ifeq ($(mixed-targets),1) -endif # skip-makefile - -PHONY += FORCE -FORCE: - # Documentation # run Makefile in doc directory dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub \ latex latexpdf text man changes linkcheck html doctest: - @$(MAKE) -C doc $@ + $(Q)$(MAKE) -C $(srctree)/doc BUILDDIR=$(CURDIR)/doc/build $@ + +endif # skip-makefile + +PHONY += FORCE +FORCE: # Declare the contents of the .PHONY variable as phony. We keep that # information in a variable so we can use it in if_changed and friends. diff --git a/Makefile.help b/Makefile.help index 067c750..e6f538d 100644 --- a/Makefile.help +++ b/Makefile.help @@ -26,5 +26,5 @@ help: @echo ' randconfig - generate a random configuration' @echo @echo 'Documentation:' - @make -C doc help + @$(MAKE) -f $(srctree)/doc/Makefile help