From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id AAA22A04BC; Tue, 29 Sep 2020 17:34:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C9A661D6CD; Tue, 29 Sep 2020 17:34:27 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 280201D6BF for ; Tue, 29 Sep 2020 17:34:22 +0200 (CEST) IronPort-SDR: bcdGjYI0TwEZ7tvfPkViTrEMpteEKQWQLfROh5Hl7qMhj9X5r1FXUK1PHESDiYFjGrtUlR0wDb fGbSXcrhYQAw== X-IronPort-AV: E=McAfee;i="6000,8403,9759"; a="223809937" X-IronPort-AV: E=Sophos;i="5.77,319,1596524400"; d="scan'208";a="223809937" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2020 08:34:22 -0700 IronPort-SDR: 1fuCquKbTXK8UL/mWE7GZtPGEc8K4uP4h1EtrN+6YHMtHgHTWFW2Ry8hhqf5oijLtNO/A47o1s IEUcK0EWu4aQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,319,1596524400"; d="scan'208";a="514726430" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga005.fm.intel.com with ESMTP; 29 Sep 2020 08:34:21 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: thomas@monjalon.net, Bruce Richardson Date: Tue, 29 Sep 2020 16:34:11 +0100 Message-Id: <20200929153413.280581-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200929153413.280581-1-bruce.richardson@intel.com> References: <20200929153413.280581-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 2/4] doc/api: align output folder with sphinx guides X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The API docs were output to "/doc/api/api" folder, which was ugly-looking with the repeated "api", and inconsistent with the sphinx guides which were written to "/doc/guides/html". Changing the doxgen output folder to "html" fixes both these issues. Signed-off-by: Bruce Richardson --- doc/api/meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/api/meson.build b/doc/api/meson.build index 49d5b9a15..e9b49f9c2 100644 --- a/doc/api/meson.build +++ b/doc/api/meson.build @@ -34,7 +34,7 @@ cdata = configuration_data() cdata.set('VERSION', meson.project_version()) cdata.set('API_EXAMPLES', join_paths(meson.build_root(), 'doc', 'api', 'examples.dox')) cdata.set('OUTPUT', join_paths(meson.build_root(), 'doc', 'api')) -cdata.set('HTML_OUTPUT', 'api') +cdata.set('HTML_OUTPUT', 'html') cdata.set('TOPDIR', meson.source_root()) cdata.set('STRIP_FROM_PATH', meson.source_root()) @@ -45,8 +45,8 @@ doxy_conf = configure_file(input: 'doxy-api.conf.in', doxy_build = custom_target('doxygen', depends: example, input: doxy_conf, - output: 'api', - depfile: 'api.d', + output: 'html', + depfile: 'html.d', command: [generate_doxygen, '@INPUT@', '@OUTPUT@', generate_css], install: get_option('enable_docs'), install_dir: htmldir, -- 2.25.1