From patchwork Thu Jan 15 08:54:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 43150 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3E814240BA for ; Thu, 15 Jan 2015 08:55:51 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id d49sf7433112eek.0 for ; Thu, 15 Jan 2015 00:55:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=YUoRYmO/LIp/LwJ6Z11qEWDFhN280BdngSG/ouV9ORs=; b=H1n3OWcW+rS5WSuokhl3n0D4y0S1LwUSC90l48BLg+lh5lbu2ChSqAGrd8YCc00qao HKeJ/W20Rt227iEinoLZuRg14/9Glu8ySiGX18WQ/URKz+ijI37A7Fxw84CQINS82K31 X5gP62VP2q1sSYocPoMINNVsYM9nK1lPo25oQplzsb4Bde7T0aMy08cp/uyIpkicTn6W 1ysC3WnWhw8Li+w2OUl9JMu26ov5z2wz+XgMoTAAzyll1EgMTZMB1q+ScTAyXA2iJwTh 15yFMfVXaX3WvpyOD1H/0iT8vdtH4MxnA2OTFq6kPmvASJpNqKih28U//LNKlh7IUlXh PwAw== X-Gm-Message-State: ALoCoQkUh03uNviMgnUfAAgHwAab28VnvyI5OrAwDdFc2fMUVeI2XBcVGiwZUXX3PYoHsF5K9yQb X-Received: by 10.180.19.42 with SMTP id b10mr4171961wie.0.1421312150458; Thu, 15 Jan 2015 00:55:50 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.203.136 with SMTP id kq8ls195700lac.84.gmail; Thu, 15 Jan 2015 00:55:50 -0800 (PST) X-Received: by 10.112.43.66 with SMTP id u2mr8496263lbl.35.1421312150294; Thu, 15 Jan 2015 00:55:50 -0800 (PST) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id ug7si759098lbb.108.2015.01.15.00.55.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 00:55:50 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by mail-la0-f54.google.com with SMTP id pv20so12387604lab.13 for ; Thu, 15 Jan 2015 00:55:50 -0800 (PST) X-Received: by 10.112.26.135 with SMTP id l7mr8272791lbg.56.1421312150167; Thu, 15 Jan 2015 00:55:50 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.9.200 with SMTP id c8csp1962490lbb; Thu, 15 Jan 2015 00:55:49 -0800 (PST) X-Received: by 10.224.0.132 with SMTP id 4mr13819646qab.103.1421312148838; Thu, 15 Jan 2015 00:55:48 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id t88si1228476qga.10.2015.01.15.00.55.47 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 15 Jan 2015 00:55:48 -0800 (PST) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YBgDS-0006uo-3K; Thu, 15 Jan 2015 08:55:46 +0000 Received: from mail-la0-f44.google.com ([209.85.215.44]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YBgD8-0006rU-3t for lng-odp@lists.linaro.org; Thu, 15 Jan 2015 08:55:26 +0000 Received: by mail-la0-f44.google.com with SMTP id gd6so12489613lab.3 for ; Thu, 15 Jan 2015 00:55:20 -0800 (PST) X-Received: by 10.112.129.228 with SMTP id nz4mr8452846lbb.8.1421312120440; Thu, 15 Jan 2015 00:55:20 -0800 (PST) Received: from localhost (c-853670d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.112.54.133]) by mx.google.com with ESMTPSA id ba3sm343652lbc.35.2015.01.15.00.55.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jan 2015 00:55:19 -0800 (PST) From: Anders Roxell To: lng-odp@lists.linaro.org Date: Thu, 15 Jan 2015 09:54:41 +0100 Message-Id: <1421312084-12881-6-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1421312084-12881-1-git-send-email-anders.roxell@linaro.org> References: <1421312084-12881-1-git-send-email-anders.roxell@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 5/8] doc: cleanup doxygen X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: anders.roxell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Signed-off-by: Anders Roxell --- aminclude.am | 4 ---- configure.ac | 13 ++++++++----- doc/doxygen.cfg | 2 +- m4/ax_prog_doxygen.m4 | 1 + 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/aminclude.am b/aminclude.am index a8ce032..8e03174 100644 --- a/aminclude.am +++ b/aminclude.am @@ -148,11 +148,7 @@ doxygen-doc: doxygen-html $(DX_PS_GOAL) $(DX_PDF_GOAL) @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS) rm -rf @DX_DOCDIR@ - @mkdir -p @DX_DOCDIR@/api_headers - @cp ${srcdir}/platform/linux-generic/include/api/odp_*.h @DX_DOCDIR@/api_headers - @cp ${srcdir}/platform/${with_platform}/include/api/odp_*.h @DX_DOCDIR@/api_headers $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG) - @rm -rf @DX_DOCDIR@/api_headers DX_CLEANFILES = \ @DX_DOCDIR@/@PACKAGE@.tag \ diff --git a/configure.ac b/configure.ac index 2e9faf5..d5808ec 100644 --- a/configure.ac +++ b/configure.ac @@ -9,11 +9,6 @@ AC_SYS_LARGEFILE AC_CONFIG_MACRO_DIR([m4]) AM_SILENT_RULES([yes]) -DX_HTML_FEATURE(ON) -DX_PDF_FEATURE(ON) -DX_PS_FEATURE(OFF) -DX_INIT_DOXYGEN($PACKAGE_NAME, doc/doxygen.cfg, doc/output) - # Checks for programs. AC_PROG_CC AM_PROG_CC_C_O @@ -63,6 +58,14 @@ AM_CONDITIONAL([SDK_INSTALL_PATH_], [test "x${SDK_INSTALL_PATH_}" = "x1"]) ########################################################################## +# Setup doxygen documentation +########################################################################## +DX_HTML_FEATURE(ON) +DX_PDF_FEATURE(ON) +DX_PS_FEATURE(OFF) +DX_INIT_DOXYGEN($PACKAGE_NAME, doc/doxygen.cfg, doc/output) + +########################################################################## # Enable/disable Unit tests ########################################################################## AC_ARG_ENABLE([cunit], diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg index ff7c278..12d7cd1 100644 --- a/doc/doxygen.cfg +++ b/doc/doxygen.cfg @@ -10,7 +10,7 @@ TYPEDEF_HIDES_STRUCT = YES EXTRACT_STATIC = YES SORT_MEMBER_DOCS = NO WARN_NO_PARAMDOC = YES -INPUT = $(SRCDIR)/doc $(SRCDIR)/doc/users-guide $(DOCDIR)/api_headers $(SRCDIR)/helper/include $(SRCDIR)/example/packet $(SRCDIR)/example/l2fwd $(SRCDIR)/example/generator $(SRCDIR)/example/timer +INPUT = $(SRCDIR)/doc $(SRCDIR)/doc/users-guide $(SRCDIR)/platform/linux-generic/include/api $(SRCDIR)/platform/$(WITH_PLATFORM)/include/api $(SRCDIR)/helper/include $(SRCDIR)/example/packet $(SRCDIR)/example/l2fwd $(SRCDIR)/example/generator $(SRCDIR)/example/timer FILE_PATTERNS = odp*.h odp*.c *.dox RECURSIVE = YES SOURCE_BROWSER = YES diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4 index 0f58b3e..58bb016 100644 --- a/m4/ax_prog_doxygen.m4 +++ b/m4/ax_prog_doxygen.m4 @@ -408,6 +408,7 @@ DX_ENV_APPEND(SRCDIR, $srcdir) DX_ENV_APPEND(PROJECT, $DX_PROJECT) DX_ENV_APPEND(DOCDIR, $DX_DOCDIR) DX_ENV_APPEND(VERSION, $VERSION) +DX_ENV_APPEND(WITH_PLATFORM, $with_platform) # Doxygen itself: DX_ARG_ABLE(doc, [generate any doxygen documentation],