Signed-off-by: Anders Roxell <[email protected]>
---
.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)
--
2.1.0
_______________________________________________
lng-odp mailing list
[email protected]
http://lists.linaro.org/mailman/listinfo/lng-odp
