From patchwork Tue Jan 20 19:25:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 43420 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EF2B6218DB for ; Tue, 20 Jan 2015 19:25:29 +0000 (UTC) Received: by mail-la0-f72.google.com with SMTP id pv20sf7598225lab.3 for ; Tue, 20 Jan 2015 11:25:28 -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=V+haBU5i3Gfe1gSKE98ouD6+7o++EPO7IqN5NL8Sfcg=; b=V/xFi7Z7N1kMZyXDRR69JbYsHst3b8k+ltrYWtfSjzI2G3f16hkExCAPIyPMYon+3h xOFb0/6PQ3+LVleDMsn7lvpBEWw+9kXnPbzAbXE1iFO66awImfQSoP6FLVEvSx6S0j4N 8qaUr1rTmJDj6xxZ/erBqjh5dgxhSXnhI7AY81OX+msG89hZ2D7QnzbmGNw1+2KVxy+3 7IW3gynEDg4oEJf+hAStXVBgvksSCzBEq2mTIEac7EK9OIrvtFoCdKao5wUaGX9/dwGi dLok1h8xLfS0XmIFeeKQvsmhPY6DZgKyYYBGwKPNeGP8nirISpIS4N7deULZciOMt1rL saGQ== X-Gm-Message-State: ALoCoQlwjCOBUokAV/c/hFulVLTTLY6P5NH/1qTobg9Y8guT/YI2/cw3C8EviSmYlRHpO7ERERpr X-Received: by 10.112.89.36 with SMTP id bl4mr4593643lbb.1.1421781928931; Tue, 20 Jan 2015 11:25:28 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.205.38 with SMTP id ld6ls771016lac.50.gmail; Tue, 20 Jan 2015 11:25:28 -0800 (PST) X-Received: by 10.112.172.167 with SMTP id bd7mr40675350lbc.14.1421781928779; Tue, 20 Jan 2015 11:25:28 -0800 (PST) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id dx2si16035016lbc.71.2015.01.20.11.25.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 20 Jan 2015 11:25:28 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by mail-la0-f48.google.com with SMTP id gf13so36156516lab.7 for ; Tue, 20 Jan 2015 11:25:28 -0800 (PST) X-Received: by 10.112.125.41 with SMTP id mn9mr40083313lbb.80.1421781928326; Tue, 20 Jan 2015 11:25:28 -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 c8csp1526006lbb; Tue, 20 Jan 2015 11:25:27 -0800 (PST) X-Received: by 10.224.80.202 with SMTP id u10mr52633053qak.60.1421781926648; Tue, 20 Jan 2015 11:25:26 -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 it2si1531054qcb.3.2015.01.20.11.25.25 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 20 Jan 2015 11:25:26 -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 1YDeQU-0001Bv-3W; Tue, 20 Jan 2015 19:25:22 +0000 Received: from mail-la0-f43.google.com ([209.85.215.43]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YDeQP-0001Bq-AP for lng-odp@lists.linaro.org; Tue, 20 Jan 2015 19:25:17 +0000 Received: by mail-la0-f43.google.com with SMTP id q1so20983206lam.2 for ; Tue, 20 Jan 2015 11:25:11 -0800 (PST) X-Received: by 10.152.25.129 with SMTP id c1mr40870181lag.65.1421781911265; Tue, 20 Jan 2015 11:25:11 -0800 (PST) Received: from localhost (c-853670d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.112.54.133]) by mx.google.com with ESMTPSA id cy6sm4226611lbb.39.2015.01.20.11.25.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Jan 2015 11:25:10 -0800 (PST) From: Anders Roxell To: lng-odp@lists.linaro.org Date: Tue, 20 Jan 2015 20:25:22 +0100 Message-Id: <1421781922-17022-1-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1421761814-21433-1-git-send-email-anders.roxell@linaro.org> References: <1421761814-21433-1-git-send-email-anders.roxell@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv2 3/3] doc: cleanup doxygen build rules 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.48 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 Reviewed-by: Steve McIntyre --- aminclude.am | 4 ---- configure.ac | 11 +++++++---- doc/doxygen.cfg | 2 +- m4/ax_prog_doxygen.m4 | 1 + 4 files changed, 9 insertions(+), 9 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 39610ee..407b213 100644 --- a/configure.ac +++ b/configure.ac @@ -9,10 +9,6 @@ AC_SYS_LARGEFILE AC_CONFIG_MACRO_DIR([m4]) AM_SILENT_RULES([yes]) -DX_HTML_FEATURE(ON) -DX_PDF_FEATURE(ON) -DX_INIT_DOXYGEN($PACKAGE_NAME, doc/doxygen.cfg, doc/output) - # Checks for programs. AC_PROG_CC AM_PROG_CC_C_O @@ -67,6 +63,13 @@ AM_CONDITIONAL([SDK_INSTALL_PATH_], [test "x${SDK_INSTALL_PATH_}" = "x1"]) ########################################################################## +# Setup doxygen documentation +########################################################################## +DX_HTML_FEATURE(ON) +DX_PDF_FEATURE(ON) +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],