From patchwork Tue Jan 20 13:50:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 43367 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f197.google.com (mail-we0-f197.google.com [74.125.82.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E850C218DB for ; Tue, 20 Jan 2015 13:50:30 +0000 (UTC) Received: by mail-we0-f197.google.com with SMTP id l61sf5936919wev.0 for ; Tue, 20 Jan 2015 05:50:30 -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=9qHuN6uv7ec7Dz/5x87XvMKb+YDdC178Adm79YUOD0Y=; b=IzleKknhR6C3HOH0wnNbteyqT1D9T6NTYi5QbapjaMn72YQGjGEvQP3rkIgbqiO8sN Dz+TjKRcekexwwdg98MHD+02L0xaAjmHVOyylcwIo9HQOh5bivCVK+Gm2easC9QCqd/P ISkcUr9UtmP2Vl3Unlc56Vk99r269iYuJHtAJtlVVB+frksLE6gj/DjZ3uYTX/8DHyuc S4Un3CwQ58p32rWLF49ZRlk8ub9vRuM5hXGWT17qHKHQbFmB0mYO7qQV7MAiW2Jrrwbw S2iK6ULy2UG3+Qo7sTlyn55+rOHYqQiqY1nQL85V9Xmu5Kv99PaDbMB9fonTgLuy2VX8 kyqg== X-Gm-Message-State: ALoCoQm9OCYPfT1fsnJHAuUIorReIh1QNDkOSWSrQWsaToa9eVY1TFAl7YpnDVrBc/a/HBikF9aT X-Received: by 10.180.108.197 with SMTP id hm5mr822730wib.4.1421761830286; Tue, 20 Jan 2015 05:50:30 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.97 with SMTP id v1ls761004lal.29.gmail; Tue, 20 Jan 2015 05:50:30 -0800 (PST) X-Received: by 10.152.116.46 with SMTP id jt14mr17364482lab.87.1421761830086; Tue, 20 Jan 2015 05:50:30 -0800 (PST) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id d5si16637777lab.63.2015.01.20.05.50.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 20 Jan 2015 05:50:30 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by mail-lb0-f182.google.com with SMTP id l4so8143078lbv.13 for ; Tue, 20 Jan 2015 05:50:30 -0800 (PST) X-Received: by 10.112.98.99 with SMTP id eh3mr37660634lbb.32.1421761829649; Tue, 20 Jan 2015 05:50:29 -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 c8csp1423743lbb; Tue, 20 Jan 2015 05:50:28 -0800 (PST) X-Received: by 10.140.37.39 with SMTP id q36mr43709642qgq.89.1421761826591; Tue, 20 Jan 2015 05:50: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 c75si10651113qge.26.2015.01.20.05.50.25 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 20 Jan 2015 05:50: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 1YDZCJ-0000yN-Sp; Tue, 20 Jan 2015 13:50:23 +0000 Received: from mail-lb0-f176.google.com ([209.85.217.176]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YDZC5-0000wA-PJ for lng-odp@lists.linaro.org; Tue, 20 Jan 2015 13:50:09 +0000 Received: by mail-lb0-f176.google.com with SMTP id z12so12906514lbi.7 for ; Tue, 20 Jan 2015 05:50:04 -0800 (PST) X-Received: by 10.152.45.4 with SMTP id i4mr38605389lam.74.1421761804250; Tue, 20 Jan 2015 05:50:04 -0800 (PST) Received: from localhost (c-853670d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.112.54.133]) by mx.google.com with ESMTPSA id qe1sm4025960lbc.27.2015.01.20.05.50.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Jan 2015 05:50:03 -0800 (PST) From: Anders Roxell To: lng-odp@lists.linaro.org Date: Tue, 20 Jan 2015 14:50:14 +0100 Message-Id: <1421761814-21433-4-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] [PATCH 3/3] 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.217.182 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 440cc63..c85ffc2 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 @@ -62,6 +58,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],