diff mbox

[PATCHv2,3/3] doc: cleanup doxygen build rules

Message ID 1421781922-17022-1-git-send-email-anders.roxell@linaro.org
State Accepted
Commit 10e72e1ea5dcb45c93917f9bd313901b0e747a03
Headers show

Commit Message

Anders Roxell Jan. 20, 2015, 7:25 p.m. UTC 
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Reviewed-by: Steve McIntyre <steve.mcintyre@linaro.org>
---
 aminclude.am          |  4 ----
 configure.ac          | 11 +++++++----
 doc/doxygen.cfg       |  2 +-
 m4/ax_prog_doxygen.m4 |  1 +
 4 files changed, 9 insertions(+), 9 deletions(-)
diff mbox

Patch

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],