From patchwork Thu Dec 18 23:01:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 42479 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5378F26C8B for ; Thu, 18 Dec 2014 23:02:39 +0000 (UTC) Received: by mail-la0-f71.google.com with SMTP id q1sf1453718lam.6 for ; Thu, 18 Dec 2014 15:02:38 -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=djiDPRbloU/mj9+T+lScYWucjgUlLPMI6F+vnvhJhbQ=; b=LMIgdPAbk8d2DrxU+GNNDmHKKAU/qkTZFCmAuyLtnuSbxrv4wQOmhQ9LdHubfALYKw IUuYpeM6FU6juJoxWT7nBj1mSvHJ3uMagILZARoe9ewrPJhw9w/quNKNDHR7bul70nA2 a2m9mHkhWPFMjWSrSFf/QHf2cSbInUoN9dRBpcGcHt2b+Rej4fHK7FCHa8j8ipEO58HQ RA+cW3r9n3Exw+fW1ExCpr5Yl78RkmUWHCm94yQXnnb8uBEpY+1qSjKdkNPLmNvfiOfW PFyi01elLaCVMcNZoGlZgjMmvM5JBPBjVXu/GJSd2HM12ZHQe1RJfdOuIb/pppFLBuU7 /K9Q== X-Gm-Message-State: ALoCoQnLpjTkATRLG5A0WM7I5a5mcOuPlqw40txTUZWuXdmGIyCNeyGldyqRuOcd0wH95qZhHDdH X-Received: by 10.112.137.136 with SMTP id qi8mr109lbb.13.1418943758339; Thu, 18 Dec 2014 15:02:38 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.234.169 with SMTP id uf9ls134257lac.75.gmail; Thu, 18 Dec 2014 15:02:38 -0800 (PST) X-Received: by 10.112.65.195 with SMTP id z3mr4877925lbs.36.1418943758017; Thu, 18 Dec 2014 15:02:38 -0800 (PST) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id ui10si8249636lbb.62.2014.12.18.15.02.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Dec 2014 15:02:38 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id z11so1758337lbi.24 for ; Thu, 18 Dec 2014 15:02:37 -0800 (PST) X-Received: by 10.112.41.234 with SMTP id i10mr4779523lbl.25.1418943756444; Thu, 18 Dec 2014 15:02:36 -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.142.69 with SMTP id ru5csp92982lbb; Thu, 18 Dec 2014 15:02:35 -0800 (PST) X-Received: by 10.140.101.204 with SMTP id u70mr8266225qge.0.1418943754740; Thu, 18 Dec 2014 15:02:34 -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 k92si10026621qgk.87.2014.12.18.15.02.33 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 18 Dec 2014 15:02:34 -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 1Y1k5Y-00019k-9Y; Thu, 18 Dec 2014 23:02:32 +0000 Received: from mail-la0-f54.google.com ([209.85.215.54]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Y1k58-00014s-BT for lng-odp@lists.linaro.org; Thu, 18 Dec 2014 23:02:06 +0000 Received: by mail-la0-f54.google.com with SMTP id pv20so1873442lab.13 for ; Thu, 18 Dec 2014 15:02:00 -0800 (PST) X-Received: by 10.112.159.129 with SMTP id xc1mr4778423lbb.24.1418943720478; Thu, 18 Dec 2014 15:02:00 -0800 (PST) Received: from localhost (c-853670d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.112.54.133]) by mx.google.com with ESMTPSA id wv5sm2155836lbb.20.2014.12.18.15.01.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Dec 2014 15:01:59 -0800 (PST) From: Anders Roxell To: lng-odp@lists.linaro.org Date: Fri, 19 Dec 2014 00:01:49 +0100 Message-Id: <1418943710-17817-7-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1418943710-17817-1-git-send-email-anders.roxell@linaro.org> References: <1418943710-17817-1-git-send-email-anders.roxell@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 6/7] doc: move Makefile structure into doc dir 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.179 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 --- .gitignore | 2 +- Makefile.am | 5 +---- configure.ac | 3 ++- doc/Makefile.am | 23 +++++++++++++++++++++++ 4 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 doc/Makefile.am diff --git a/.gitignore b/.gitignore index 2760d6c..3d74f23 100644 --- a/.gitignore +++ b/.gitignore @@ -29,7 +29,7 @@ pkgconfig/libodp.pc cscope.out tags lib/ -doxygen-doc +doc/output test-driver core .dirstamp diff --git a/Makefile.am b/Makefile.am index 21f1b11..3f80a2a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,8 @@ ACLOCAL_AMFLAGS=-I m4 AUTOMAKE_OPTIONS = foreign -SUBDIRS = platform example test +SUBDIRS = doc platform example test include $(top_srcdir)/aminclude.am EXTRA_DIST = bootstrap $(DX_CONFIG) - -clean-local: - rm -rf $(top_builddir)/doxygen-doc diff --git a/configure.ac b/configure.ac index bc97f1a..bc7fdac 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AM_SILENT_RULES([yes]) DX_HTML_FEATURE(ON) DX_PDF_FEATURE(ON) -DX_INIT_DOXYGEN($PACKAGE_NAME, doc/doxygen.cfg) +DX_INIT_DOXYGEN($PACKAGE_NAME, doc/doxygen.cfg, doc/output) # Checks for programs. AC_PROG_CC @@ -199,6 +199,7 @@ AC_CONFIG_FILES([Makefile example/odp_example/Makefile example/packet/Makefile example/timer/Makefile + doc/Makefile test/Makefile test/api_test/Makefile test/validation/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..67727e1 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,23 @@ +noinst_docdatadir = ${datadir}/doc +noinst_imagedir = ${datadir}/doc/images +noinst_usersguidedir = ${datadir}/doc/users-guide + +noinst_docdata_DATA = \ + $(srcdir)/doxygen.cfg \ + $(srcdir)/odp.dox \ + $(srcdir)/odpdoxygen.css + +noinst_image_DATA = \ + $(srcdir)/images/ODP-Logo-HQ.png \ + $(srcdir)/images/overview.eps \ + $(srcdir)/images/overview.png + +noinst_usersguide_DATA = \ + $(srcdir)/users-guide/guide.dox + +dist_noinst_docdata_DATA = ${noinst_docdata_DATA} +dist_noinst_image_DATA = ${noinst_image_DATA} +dist_noinst_usersguide_DATA = ${noinst_usersguide_DATA} + +clean-local: + rm -rf $(DX_DOCDIR)