From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4CBBFC8300A for ; Wed, 29 Apr 2020 23:14:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 174B321569 for ; Wed, 29 Apr 2020 23:14:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="an0eB0YQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727898AbgD2XOw (ORCPT ); Wed, 29 Apr 2020 19:14:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727830AbgD2XOu (ORCPT ); Wed, 29 Apr 2020 19:14:50 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CB9BC03C1AE for ; Wed, 29 Apr 2020 16:14:50 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id y7so5483600ybj.15 for ; Wed, 29 Apr 2020 16:14:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=i/C9Y5GBkF2sbab6q3+mjJTMGZ+JZWwA9+KZOitr3OM=; b=an0eB0YQUWdRXYpVKwcafDNEnJADvqWwOxc0VVxK6auzCfPBKH3gE+lFd5qWvSTHpe 8Ch92zMhwRQH3dpWUOkhNMsFaaQ5UhvY22buMZ3MootPfH5NESaPKeQrf01GwcCs8hs/ aRC3v/RRPKcQtr+NMDmSd1tpy9DFNpA4HtMR1YUMghkMiqhQ9mvSjYMdcLpahsM4goha AMfRZNYl/VYY1ODzm8vOgGOaGJd1QZIIh4xOueTRZb/PY/mWSs3fJbzyQFucgi0mes5g Hl6m7DsNEFotBNNwJpr3f8RCglj74BkHPNAQAF8V2SMgSDoqPi+X8DLzkS/NVpHmAIAK o8+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=i/C9Y5GBkF2sbab6q3+mjJTMGZ+JZWwA9+KZOitr3OM=; b=TpVAsdXPgto7ukyRLFRepAFmdTIKmbP75P++bEG7C7BSeC1/qnQ1PHBdt6bWmm0Q8Z lemMoZCkSDF1RNnuFr+xmEWc6lvquz3RDxMRGuEKUx2rPGat+D/p+jzDHsXzWDi5mGLo JiBTMquTZmZR0CqW6wr4jjkx51vFnZ3YjG+867fOewQ5IqWnBwolgtu/sqj0Zi0Lqt3u Rs9aDV9sXIkMP7wH7rqL90dHshNcGbYA3KHi2+CCpHPurEccduHObm1GfO5ETak7UIBV PW0JXVhg1x6yt9lvLOHXB1QU+ZpDk1q5+mA86gyLX8XsPL6XfQgNhLZ166IEKc/twy3Y u8MA== X-Gm-Message-State: AGi0Pua3C3qHPWbCypTKHdzpRLkIIHnzusNjEH6qUy8JpkfJwSzz4OpA HYJj2dWrZyPMHeK1NmWhm+6yyRen+XH2 X-Google-Smtp-Source: APiQypJBTqSQS3d0yu8bI0zf5TDtC47H8/IA8UDPVs9BcVPOkO0Zx3N6T0EyoA/W4eHBYS3cvi7+g+4ELU0/ X-Received: by 2002:a25:908c:: with SMTP id t12mr1151108ybl.206.1588202089102; Wed, 29 Apr 2020 16:14:49 -0700 (PDT) Date: Wed, 29 Apr 2020 16:14:40 -0700 In-Reply-To: <20200429231443.207201-1-irogers@google.com> Message-Id: <20200429231443.207201-2-irogers@google.com> Mime-Version: 1.0 References: <20200429231443.207201-1-irogers@google.com> X-Mailer: git-send-email 2.26.2.303.gf8c07b1a785-goog Subject: [PATCH v12 1/4] perf doc: pass ASCIIDOC_EXTRA as an argument From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Yonghong Song , Andrii Nakryiko , Greg Kroah-Hartman , Thomas Gleixner , Igor Lubashev , Alexey Budankov , Florian Fainelli , Adrian Hunter , Andi Kleen , Jiwei Sun , yuzhoujian , Kan Liang , Jin Yao , Leo Yan , John Garry , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org commit e9cfa47e687d ("perf doc: allow ASCIIDOC_EXTRA to be an argument") allowed ASCIIDOC_EXTRA to be passed as an option to the Documentation Makefile. This change passes ASCIIDOC_EXTRA, set by detected features or command line options, prior to doing a Documentation build. This is necessary to allow conditional compilation, based on configuration variables, in asciidoc code. Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index d15a311408f1..94a495594e99 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -188,7 +188,7 @@ AWK = awk # non-config cases config := 1 -NON_CONFIG_TARGETS := clean python-clean TAGS tags cscope help install-doc install-man install-html install-info install-pdf doc man html info pdf +NON_CONFIG_TARGETS := clean python-clean TAGS tags cscope help ifdef MAKECMDGOALS ifeq ($(filter-out $(NON_CONFIG_TARGETS),$(MAKECMDGOALS)),) @@ -832,7 +832,7 @@ INSTALL_DOC_TARGETS += quick-install-doc quick-install-man quick-install-html # 'make doc' should call 'make -C Documentation all' $(DOC_TARGETS): - $(Q)$(MAKE) -C $(DOC_DIR) O=$(OUTPUT) $(@:doc=all) + $(Q)$(MAKE) -C $(DOC_DIR) O=$(OUTPUT) $(@:doc=all) ASCIIDOC_EXTRA=$(ASCIIDOC_EXTRA) TAG_FOLDERS= . ../lib ../include TAG_FILES= ../../include/uapi/linux/perf_event.h @@ -959,7 +959,7 @@ install-python_ext: # 'make install-doc' should call 'make -C Documentation install' $(INSTALL_DOC_TARGETS): - $(Q)$(MAKE) -C $(DOC_DIR) O=$(OUTPUT) $(@:-doc=) + $(Q)$(MAKE) -C $(DOC_DIR) O=$(OUTPUT) $(@:-doc=) ASCIIDOC_EXTRA=$(ASCIIDOC_EXTRA) ### Cleaning rules -- 2.26.2.303.gf8c07b1a785-goog